GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Roth 2023-07-21 14:10:51 -06:00 committed by Martin L Roth
parent 799e79d166
commit 18fd3a2315
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/docker/Makefile
View File

@ -48,10 +48,11 @@ coreboot-sdk: test-docker
sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/g" | \ sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/g" | \
$(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) - $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) -
coreboot-sdk-test: coreboot-sdk test-docker coreboot-jenkins-test: test-docker
@echo "Testing coreboot SDK $(crossgcc_version), built from commit $(DOCKER_COMMIT)" @echo "Testing coreboot SDK and jenkins node version $(crossgcc_version), built from commit $(DOCKER_COMMIT)"
cat coreboot-sdk-test/Dockerfile | \ cat coreboot-jenkins-test/Dockerfile | \
$(DOCKER) build -t coreboot/coreboot-sdk-test:$(COREBOOT_IMAGE_TAG) - sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/g" | \
$(DOCKER) build -t coreboot/coreboot-jenkins-test:$(COREBOOT_IMAGE_TAG) -
upload-coreboot-sdk: test-docker-login upload-coreboot-sdk: test-docker-login
$(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) $(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG)
@ -186,6 +187,7 @@ docker-livehtml-docs:
help: help:
@echo "Commands for working with docker images:" @echo "Commands for working with docker images:"
@echo " coreboot-sdk - Build coreboot-sdk container" @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 " upload-coreboot-sdk - Upload coreboot-sdk to hub.docker.com"
@echo " coreboot-jenkins-node - Build coreboot-jenkins-node container" @echo " coreboot-jenkins-node - Build coreboot-jenkins-node container"
@echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com" @echo " upload-coreboot-jenkins-node - Upload coreboot-jenkins-node to hub.docker.com"
@ -215,7 +217,7 @@ help:
@echo " DOCKER_COMMIT=$(DOCKER_COMMIT)" @echo " DOCKER_COMMIT=$(DOCKER_COMMIT)"
.PHONY: test-docker test-docker-login .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: coreboot-sdk upload-coreboot-sdk
.PHONY: doc.coreboot.org .PHONY: doc.coreboot.org
.PHONY: clean-coreboot-containers clean-coreboot-images .PHONY: clean-coreboot-containers clean-coreboot-images

5
util/docker/coreboot-sdk-test/Dockerfile → util/docker/coreboot-jenkins-test/Dockerfile
View File

@ -1,4 +1,5 @@
FROM coreboot-sdk FROM coreboot/coreboot-jenkins-node:{{SDK_VERSION}}
# Test the built image # Test the built image
RUN mkdir -p /tmp/work && \ RUN mkdir -p /tmp/work && \
cd /tmp/work && \ cd /tmp/work && \
@ -25,7 +26,7 @@ RUN \
RUN \ RUN \
cd /tmp/work && \ cd /tmp/work && \
make -C coreboot test-payloads&& \ make -C coreboot test-payloads && \
make -C coreboot test-tools -j && \ make -C coreboot test-tools -j && \
make -C coreboot test-lint -j && \ make -C coreboot test-lint -j && \
make -C coreboot test-cleanup -j && \ make -C coreboot test-cleanup -j && \