util/docker: Update coreboot-sdk-test to coreboot-jenkins-test
The coreboot-jenkins-test docker image takes the coreboot-jenkins-node
docker image and runs a series of tests to verify that things build
properly.
This was original created to test the coreboot-sdk, but build functions
like the documentation have been moved from the sdk image into the
jenkins node, so the test needs to be renamed.
Add the makefile target to the help and phony target list at the same
time.
Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: I0e6282bbb163064f177c8e68e7180ba2bdc101f1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76706
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
diff --git a/util/docker/Makefile b/util/docker/Makefile
index c86d8fd..c4713dd 100644
--- a/util/docker/Makefile
+++ b/util/docker/Makefile
@@ -48,10 +48,11 @@
sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/g" | \
$(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) -
-coreboot-sdk-test: coreboot-sdk test-docker
- @echo "Testing coreboot SDK $(crossgcc_version), built from commit $(DOCKER_COMMIT)"
- cat coreboot-sdk-test/Dockerfile | \
- $(DOCKER) build -t coreboot/coreboot-sdk-test:$(COREBOOT_IMAGE_TAG) -
+coreboot-jenkins-test: test-docker
+ @echo "Testing coreboot SDK and jenkins node version $(crossgcc_version), built from commit $(DOCKER_COMMIT)"
+ cat coreboot-jenkins-test/Dockerfile | \
+ sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/g" | \
+ $(DOCKER) build -t coreboot/coreboot-jenkins-test:$(COREBOOT_IMAGE_TAG) -
upload-coreboot-sdk: test-docker-login
$(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG)
@@ -186,6 +187,7 @@
help:
@echo "Commands for working with docker images:"
@echo " coreboot-sdk - Build coreboot-sdk container"
+ @echo " coreboot-jenkins-test - Test the coreboot-jenkins-node build functionality"
@echo " upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com"
@echo " coreboot-jenkins-node - Build coreboot-jenkins-node container"
@echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com"
@@ -215,7 +217,7 @@
@echo " DOCKER_COMMIT=$(DOCKER_COMMIT)"
.PHONY: test-docker test-docker-login
-.PHONY: coreboot-jenkins-node upload-coreboot-jenkins-node
+.PHONY: coreboot-jenkins-node upload-coreboot-jenkins-node coreboot-jenkins-test
.PHONY: coreboot-sdk upload-coreboot-sdk
.PHONY: doc.coreboot.org
.PHONY: clean-coreboot-containers clean-coreboot-images
diff --git a/util/docker/coreboot-sdk-test/Dockerfile b/util/docker/coreboot-jenkins-test/Dockerfile
similarity index 91%
rename from util/docker/coreboot-sdk-test/Dockerfile
rename to util/docker/coreboot-jenkins-test/Dockerfile
index 0ea57d1..030c4d2 100644
--- a/util/docker/coreboot-sdk-test/Dockerfile
+++ b/util/docker/coreboot-jenkins-test/Dockerfile
@@ -1,4 +1,5 @@
-FROM coreboot-sdk
+FROM coreboot/coreboot-jenkins-node:{{SDK_VERSION}}
+
# Test the built image
RUN mkdir -p /tmp/work && \
cd /tmp/work && \
@@ -25,7 +26,7 @@
RUN \
cd /tmp/work && \
- make -C coreboot test-payloads&& \
+ make -C coreboot test-payloads && \
make -C coreboot test-tools -j && \
make -C coreboot test-lint -j && \
make -C coreboot test-cleanup -j && \