Keith Short has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34183 )
Change subject: DO NOT SUBMIT: test of coreboot-gerrit jenkins job ......................................................................
DO NOT SUBMIT: test of coreboot-gerrit jenkins job
Enable verbose mode for libpayload to troubleshoot why a libpayload compile error was not caught by the build bot.
Change-Id: I43b55f402216582dcf81be34171437be345572ab Signed-off-by: Keith Short keithshort@chromium.org --- M payloads/libpayload/Makefile.inc M util/testing/Makefile.inc 2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/34183/1
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 7787762..3c92504 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -130,6 +130,7 @@ echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp for i in $(filter-out %.old,$(wildcard configs/*)); do \ $(MAKE) clean; \ + echo "Building libpayload for $$i"; \ cp "$$i" junit_config; \ $(MAKE) olddefconfig DOTCONFIG=junit_config V=$(V) Q=$(Q) 2>/dev/null >/dev/null; \ echo "<testcase classname='libpayload' name='$$i'>" >> $@.tmp; \ diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index 2b98730..a580758 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -85,7 +85,7 @@ util/lint/lint lint-extended --junit util/abuild/abuild -B -J $(if $(V),-v,) $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml util/abuild/abuild -B -J $(if $(V),-v,) $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) - (cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml) + (cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=1 Q=$(Q) junit.xml) $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR="util/$(tool)" BLD="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; ) unset COREBOOT_BUILD_DIR;$(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/nvramcui BLD=nvramcui MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml unset COREBOOT_BUILD_DIR;$(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/coreinfo BLD=coreinfo MFLAGS= MAKEFLAGS= MAKETARGET=defaultbuild junit.xml
Keith Short has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34183 )
Change subject: util/testing: Ensure coreboot-gerrit fails if libpayload build fails ......................................................................
Patch Set 5:
This change is ready for review.
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34183 )
Change subject: util/testing: Ensure coreboot-gerrit fails if libpayload build fails ......................................................................
Patch Set 5: Code-Review+2
I'm curious, what makes coreinfo delete the logs?
Keith Short has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34183 )
Change subject: util/testing: Ensure coreboot-gerrit fails if libpayload build fails ......................................................................
Patch Set 5:
Patch Set 5: Code-Review+2
I'm curious, what makes coreinfo delete the logs?
coreinfo's libpayload target does distclean/defconfig/install of libpayload. The nvramcui makefile does not run distclean.
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34183 )
Change subject: util/testing: Ensure coreboot-gerrit fails if libpayload build fails ......................................................................
util/testing: Ensure coreboot-gerrit fails if libpayload build fails
The JUnit output from the libpayload builds was getting deleted by the coreinfo build. Move the libpayload to later in the coreboot-gerrit job.
Also add messages to stdout indicating the various libpayload configs that are built and a message indicating when all libpayload builds are complete.
BUG=b:137380189 TEST=Upload test commit that includes a libpayload compile error and verify buildbot fails.
Change-Id: I43b55f402216582dcf81be34171437be345572ab Signed-off-by: Keith Short keithshort@chromium.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/34183 Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M payloads/libpayload/Makefile.inc M util/testing/Makefile.inc 2 files changed, 3 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 7787762..1fa07f9 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -130,6 +130,7 @@ echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp for i in $(filter-out %.old,$(wildcard configs/*)); do \ $(MAKE) clean; \ + echo "Building libpayload for $$i"; \ cp "$$i" junit_config; \ $(MAKE) olddefconfig DOTCONFIG=junit_config V=$(V) Q=$(Q) 2>/dev/null >/dev/null; \ echo "<testcase classname='libpayload' name='$$i'>" >> $@.tmp; \ @@ -146,6 +147,7 @@ echo "</testcase>" >> $@.tmp; \ done echo "</testsuite>" >> $@.tmp + echo "libpayload build complete, test results in $@" mv $@.tmp $@
test-configs: diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index 2b98730..80e29ef 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -85,10 +85,10 @@ util/lint/lint lint-extended --junit util/abuild/abuild -B -J $(if $(V),-v,) $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml util/abuild/abuild -B -J $(if $(V),-v,) $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) - (cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml) $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR="util/$(tool)" BLD="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; ) unset COREBOOT_BUILD_DIR;$(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/nvramcui BLD=nvramcui MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml unset COREBOOT_BUILD_DIR;$(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/coreinfo BLD=coreinfo MFLAGS= MAKEFLAGS= MAKETARGET=defaultbuild junit.xml + (cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml) $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=util/romcc BLD=romcc MFLAGS= MAKEFLAGS= MAKETARGET=test junit.xml $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=src/soc/nvidia/tegra124/lp0 BLD=tegra124_lp0 MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=src/soc/nvidia/tegra210/lp0 BLD=tegra120_lp0 MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml