On 7/13/2022 4:52 PM, Ilya Maximets wrote:
On 7/14/22 01:05, 0-day Robot wrote:Bleep bloop. Greetings Greg Rose, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. build: mv tests/testsuite.tmp tests/testsuite /bin/sh /var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/system-kmod-testsuite.tmp tests/system-kmod-testsuite.at mv tests/system-kmod-testsuite.tmp tests/system-kmod-testsuite /bin/sh /var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/system-userspace-testsuite.tmp tests/system-userspace-testsuite.at mv tests/system-userspace-testsuite.tmp tests/system-userspace-testsuite /bin/sh /var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/system-tso-testsuite.tmp tests/system-tso-testsuite.at mv tests/system-tso-testsuite.tmp tests/system-tso-testsuite /bin/sh /var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/system-afxdp-testsuite.tmp tests/system-afxdp-testsuite.at mv tests/system-afxdp-testsuite.tmp tests/system-afxdp-testsuite /bin/sh /var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/system-offloads-testsuite.tmp tests/system-offloads-testsuite.at mv tests/system-offloads-testsuite.tmp tests/system-offloads-testsuite /bin/sh /var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/system-dpdk-testsuite.tmp tests/system-dpdk-testsuite.at mv tests/system-dpdk-testsuite.tmp tests/system-dpdk-testsuite /bin/sh /var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace/build-aux/missing autom4te --language=autotest -I '.' -o tests/ovsdb-cluster-testsuite.tmp tests/ovsdb-cluster-testsuite.at mv tests/ovsdb-cluster-testsuite.tmp tests/ovsdb-cluster-testsuite (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.17.90,g') < ./rhel/openvswitch.spec.in > openvswitch.spec.tmp || exit 1; if cmp -s openvswitch.spec.tmp rhel/openvswitch.spec; then touch rhel/openvswitch.spec; rm openvswitch.spec.tmp; else mv openvswitch.spec.tmp rhel/openvswitch.spec; fi (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.17.90,g') < ./rhel/openvswitch-fedora.spec.in > openvswitch-fedora.spec.tmp || exit 1; if cmp -s openvswitch-fedora.spec.tmp rhel/openvswitch-fedora.spec; then touch rhel/openvswitch-fedora.spec; rm openvswitch-fedora.spec.tmp; else mv openvswitch-fedora.spec.tmp rhel/openvswitch-fedora.spec; fi (printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' && sed -e 's,[@]VERSION[@],2.17.90,g') \ < ./xenserver/openvswitch-xen.spec.in > openvswitch-xen.spec.tmp || exit 1; \ if cmp -s openvswitch-xen.spec.tmp xenserver/openvswitch-xen.spec; then touch xenserver/openvswitch-xen.spec; rm openvswitch-xen.spec.tmp; else mv openvswitch-xen.spec.tmp xenserver/openvswitch-xen.spec; fi The following files are in git but not the distribution: include/linux/openvswitch.h make[1]: *** [dist-hook-git] Error 1Robot is giving some misleading errors here. The real error should be 'no such file or directory' for the all-distfiles file, but it looks like there is an old one on a filesystem, so it complains about the new file which is not in the outdated all-distfiles. @Aaron, maybe robot should call 'make [dist]clean' before/after each test or clean up files in some other way? Interestingly, failure of the dist-hook-git due to failure of the comm and grep doesn't fail the build... The GHA build succeeded even with the issue present: https://github.com/ovsrobot/ovs/runs/7330779128?check_suite_focus=true#step:12:6206 @Greg, we need to compare the content of 'distfiles' with 'all-gitfiles' now, since the 'all-distfiles' is no longer generated. The following change should fix the issue: diff --git a/.gitignore b/.gitignore index f1cdcf124..c70f41129 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,6 @@ /Makefile /Makefile.in /aclocal.m4 -/all-distfiles /all-gitfiles /autom4te.cache /build-arch-stamp diff --git a/Makefile.am b/Makefile.am index ede07d1cb..fff98564a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -200,19 +200,19 @@ dist-hook-git: distfiles (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \ grep -v '\.gitattributes$$' | \ LC_ALL=C sort -u > all-gitfiles; \ - LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ + LC_ALL=C comm -1 -3 distfiles all-gitfiles > missing-distfiles; \ if test -s missing-distfiles; then \ echo "The following files are in git but not the distribution:"; \ cat missing-distfiles; \ exit 1; \ fi; \ - if LC_ALL=C grep '\.gitignore$$' all-distfiles; then \ + if LC_ALL=C grep '\.gitignore$$' distfiles; then \ echo "See above for list of files that are distributed but"; \ echo "should not be."; \ exit 1; \ fi \ fi -CLEANFILES += all-distfiles all-gitfiles missing-distfiles +CLEANFILES += all-gitfiles missing-distfiles # The following is based on commands for the Automake "distdir" target. distfiles: Makefile @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ --- To check, make sure that the build log doesn't contain: comm: all-distfiles: No such file or directory grep: all-distfiles: No such file or directory Best regards, Ilya Maximets.
Hi Ilya, Yes, I've been making with fresh clones for each step of the series and have not seen this, so I'm guessing there is some cruft left over. You're patch looks good, let me incorporate it and do some more testing. David had brought up the issue of not generating 'all-distfiles earlier. But my own patch by patch testing hadn't seen the error. TL'DR there's a lot of interdependencies. I'll run more checks and see if this patch works to make the robot happy. Thanks, - Greg _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
