Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
what-jenkins-does: keep essential artifacts arounds
Keep for every board: coreboot.rom, config.h, config.build
That way these can be used in follow-up jobs.
Change-Id: I5ca5cb84ab1bcffbc92a972980cd0769ebf02462 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M util/testing/Makefile.inc 1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/35099/1
diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index d84c5a4..99f7922 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -80,7 +80,7 @@ lint lint-stable lint-extended: util/lint/lint $@
-ABUILD_OPTIONS=-B -J -c $(CPUS) -z -p $(JENKINS_PAYLOAD) +ABUILD_OPTIONS=-B -J -c $(CPUS) -p $(JENKINS_PAYLOAD) ABUILD_OPTIONS+=$(if $(V),-v,) ABUILD_OPTIONS+=$(if $(JENKINS_NOCCACHE),,-y) ABUILD_OPTIONS+=$(JENKINS_ABUILD_OPT) @@ -88,8 +88,9 @@ what-jenkins-does: util/lint/lint lint-stable --junit util/lint/lint lint-extended --junit - util/abuild/abuild $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml - util/abuild/abuild $(ABUILD_OPTIONS) + COREBOOT_BUILD_DIR=coreboot-builds-chromeos util/abuild/abuild $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml + COREBOOT_BUILD_DIR=coreboot-builds util/abuild/abuild $(ABUILD_OPTIONS) + -find coreboot-builds{,-chromeos}/[A-Z]*/* ! ( -name coreboot.rom -o -name config.h -o -name config.build ) -type f -exec rm {} +; find coreboot-builds{,-chromeos}/[A-Z]*/* -type d -exec rmdir -p {} + 2>/dev/null $(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
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
Patch Set 1: Code-Review+1
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
Patch Set 1: Code-Review+1
(2 comments)
https://review.coreboot.org/c/coreboot/+/35099/1/util/testing/Makefile.inc File util/testing/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/35099/1/util/testing/Makefile.inc@9... PS1, Line 91: COREBOOT_BUILD_DIR=coreboot-builds-chromeos would prefer usage of `-o`, so the command still comes first
https://review.coreboot.org/c/coreboot/+/35099/1/util/testing/Makefile.inc@9... PS1, Line 93: ; find any reason not to start a new recipe line here with `-find`?
Hello Patrick Rudolph, Angel Pons, build bot (Jenkins), Nico Huber, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35099
to look at the new patch set (#2).
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
what-jenkins-does: keep essential artifacts arounds
Keep for every board: coreboot.rom, config.h, config.build
That way these can be used in follow-up jobs.
Change-Id: I5ca5cb84ab1bcffbc92a972980cd0769ebf02462 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M util/testing/Makefile.inc 1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/35099/2
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/35099/1/util/testing/Makefile.inc File util/testing/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/35099/1/util/testing/Makefile.inc@9... PS1, Line 91: COREBOOT_BUILD_DIR=coreboot-builds-chromeos
would prefer usage of `-o`, so the command still comes first
Done
https://review.coreboot.org/c/coreboot/+/35099/1/util/testing/Makefile.inc@9... PS1, Line 93: ; find
any reason not to start a new recipe line here with `-find`?
Done
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
Patch Set 2: Code-Review+2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
Patch Set 2: -Code-Review
Hello Patrick Rudolph, Angel Pons, build bot (Jenkins), Nico Huber, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35099
to look at the new patch set (#3).
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
what-jenkins-does: keep essential artifacts arounds
Keep for every board: coreboot.rom, config.h, config.build
That way these can be used in follow-up jobs.
Change-Id: I5ca5cb84ab1bcffbc92a972980cd0769ebf02462 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M util/testing/Makefile.inc 1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/35099/3
Hello Patrick Rudolph, Angel Pons, build bot (Jenkins), Nico Huber, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35099
to look at the new patch set (#4).
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
what-jenkins-does: keep essential artifacts arounds
Keep for every board: coreboot.rom, config.h, config.build
That way these can be used in follow-up jobs.
Change-Id: I5ca5cb84ab1bcffbc92a972980cd0769ebf02462 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M util/testing/Makefile.inc 1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/35099/4
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
Patch Set 4: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/35099 )
Change subject: what-jenkins-does: keep essential artifacts arounds ......................................................................
what-jenkins-does: keep essential artifacts arounds
Keep for every board: coreboot.rom, config.h, config.build
That way these can be used in follow-up jobs.
Change-Id: I5ca5cb84ab1bcffbc92a972980cd0769ebf02462 Signed-off-by: Patrick Georgi pgeorgi@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35099 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com --- M util/testing/Makefile.inc 1 file changed, 8 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved
diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index d84c5a4..5bf3e8e 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -80,16 +80,21 @@ lint lint-stable lint-extended: util/lint/lint $@
-ABUILD_OPTIONS=-B -J -c $(CPUS) -z -p $(JENKINS_PAYLOAD) +ABUILD_OPTIONS=-B -J -c $(CPUS) -p $(JENKINS_PAYLOAD) ABUILD_OPTIONS+=$(if $(V),-v,) ABUILD_OPTIONS+=$(if $(JENKINS_NOCCACHE),,-y) ABUILD_OPTIONS+=$(JENKINS_ABUILD_OPT)
+COREBOOT_BUILD_DIR?=coreboot-builds + what-jenkins-does: + rm -rf $(COREBOOT_BUILD_DIR)/chromeos $(COREBOOT_BUILD_DIR)/default util/lint/lint lint-stable --junit util/lint/lint lint-extended --junit - util/abuild/abuild $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml - util/abuild/abuild $(ABUILD_OPTIONS) + util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/chromeos $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml + util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/default $(ABUILD_OPTIONS) + -find $(COREBOOT_BUILD_DIR)/{regular,chromeos}/[A-Z]*/* ! ( -name coreboot.rom -o -name config.h -o -name config.build ) -type f -exec rm {} + + -find $(COREBOOT_BUILD_DIR)/{regular,chromeos}/[A-Z]*/* -type d -exec rmdir -p {} + 2>/dev/null $(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