0a9487d80a
All jobs depending on 'docker-opensbi' job must use at most all the rules that triggers it. The simplest way to ensure that is to always use the same rules. Extract all the rules to a reusable section, and include this section (with the 'extends' keyword) in both 'docker-opensbi' and 'build-opensbi' jobs. The problem was introduced in commitc6fc0fc1a7("gitlab-ci.yml: Add jobs to build OpenSBI firmware binaries"), but was revealed in commit91e9c47e50("docker: OpenSBI build job depends on OpenSBI container"). This fix is similar to the one used with the EDK2 firmware job in commitac0595cf6b("gitlab-ci: Extract EDK2 job rules to reusable section"). Reported-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Willian Rampazzo <willianr@redhat.com> Message-Id: <20210720164829.3949558-1-philmd@redhat.com> Message-Id: <20210720232703.10650-30-alex.bennee@linaro.org>
64 lines
2.3 KiB
YAML
64 lines
2.3 KiB
YAML
# All jobs needing docker-opensbi must use the same rules it uses.
|
|
.opensbi_job_rules:
|
|
rules: # Only run this job when ...
|
|
- changes:
|
|
# this file is modified
|
|
- .gitlab-ci.d/opensbi.yml
|
|
# or the Dockerfile is modified
|
|
- .gitlab-ci.d/opensbi/Dockerfile
|
|
when: always
|
|
- changes: # or roms/opensbi/ is modified (submodule updated)
|
|
- roms/opensbi/*
|
|
when: always
|
|
- if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi'
|
|
when: always
|
|
- if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI'
|
|
when: always
|
|
|
|
docker-opensbi:
|
|
extends: .opensbi_job_rules
|
|
stage: containers
|
|
image: docker:19.03.1
|
|
services:
|
|
- docker:19.03.1-dind
|
|
variables:
|
|
GIT_DEPTH: 3
|
|
IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build
|
|
# We don't use TLS
|
|
DOCKER_HOST: tcp://docker:2375
|
|
DOCKER_TLS_CERTDIR: ""
|
|
before_script:
|
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
|
script:
|
|
- docker pull $IMAGE_TAG || true
|
|
- docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
|
--tag $IMAGE_TAG .gitlab-ci.d/opensbi
|
|
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
|
- docker push $IMAGE_TAG
|
|
|
|
build-opensbi:
|
|
extends: .opensbi_job_rules
|
|
stage: build
|
|
needs: ['docker-opensbi']
|
|
artifacts:
|
|
paths: # 'artifacts.zip' will contains the following files:
|
|
- pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
|
|
- pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
|
|
- pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
|
|
- pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
|
|
- opensbi32-generic-stdout.log
|
|
- opensbi32-generic-stderr.log
|
|
- opensbi64-generic-stdout.log
|
|
- opensbi64-generic-stderr.log
|
|
image: $CI_REGISTRY_IMAGE:opensbi-cross-build
|
|
variables:
|
|
GIT_DEPTH: 3
|
|
script: # Clone the required submodules and build OpenSBI
|
|
- git submodule update --init roms/opensbi
|
|
- export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
|
|
- echo "=== Using ${JOBS} simultaneous jobs ==="
|
|
- make -j${JOBS} -C roms/opensbi clean
|
|
- make -j${JOBS} -C roms opensbi32-generic 2>&1 1>opensbi32-generic-stdout.log | tee -a opensbi32-generic-stderr.log >&2
|
|
- make -j${JOBS} -C roms/opensbi clean
|
|
- make -j${JOBS} -C roms opensbi64-generic 2>&1 1>opensbi64-generic-stdout.log | tee -a opensbi64-generic-stderr.log >&2
|