From 19e1d631e3b93cf4553e003062934def5f091656 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 26 Aug 2019 17:45:52 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/35099 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/testing/Makefile.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index d84c5a4f9b..5bf3e8e6f1 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -80,16 +80,21 @@ CPUS?=4 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 -- 2.11.4.GIT