gitlab: normalize indentation in edk2/opensbi rules
The edk2/opensbi gitlab CI config was using single space indents which is not consistent with the rest of the gitlab CI config files. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220629170638.520630-2-berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Daniel P. Berrangé
Thomas Huth
parent
e0a2602070
commit
94b731874a
@ -1,60 +1,60 @@
|
|||||||
# All jobs needing docker-edk2 must use the same rules it uses.
|
# All jobs needing docker-edk2 must use the same rules it uses.
|
||||||
.edk2_job_rules:
|
.edk2_job_rules:
|
||||||
rules: # Only run this job when ...
|
rules: # Only run this job when ...
|
||||||
- changes:
|
- changes:
|
||||||
# this file is modified
|
# this file is modified
|
||||||
- .gitlab-ci.d/edk2.yml
|
- .gitlab-ci.d/edk2.yml
|
||||||
# or the Dockerfile is modified
|
# or the Dockerfile is modified
|
||||||
- .gitlab-ci.d/edk2/Dockerfile
|
- .gitlab-ci.d/edk2/Dockerfile
|
||||||
# or roms/edk2/ is modified (submodule updated)
|
# or roms/edk2/ is modified (submodule updated)
|
||||||
- roms/edk2/*
|
- roms/edk2/*
|
||||||
when: on_success
|
when: on_success
|
||||||
- if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with 'edk2'
|
- if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with 'edk2'
|
||||||
when: on_success
|
when: on_success
|
||||||
- if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains 'EDK2'
|
- if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains 'EDK2'
|
||||||
when: on_success
|
when: on_success
|
||||||
|
|
||||||
docker-edk2:
|
docker-edk2:
|
||||||
extends: .edk2_job_rules
|
extends: .edk2_job_rules
|
||||||
stage: containers
|
stage: containers
|
||||||
image: docker:19.03.1
|
image: docker:19.03.1
|
||||||
services:
|
services:
|
||||||
- docker:19.03.1-dind
|
- docker:19.03.1-dind
|
||||||
variables:
|
variables:
|
||||||
GIT_DEPTH: 3
|
GIT_DEPTH: 3
|
||||||
IMAGE_TAG: $CI_REGISTRY_IMAGE:edk2-cross-build
|
IMAGE_TAG: $CI_REGISTRY_IMAGE:edk2-cross-build
|
||||||
# We don't use TLS
|
# We don't use TLS
|
||||||
DOCKER_HOST: tcp://docker:2375
|
DOCKER_HOST: tcp://docker:2375
|
||||||
DOCKER_TLS_CERTDIR: ""
|
DOCKER_TLS_CERTDIR: ""
|
||||||
before_script:
|
before_script:
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
script:
|
script:
|
||||||
- docker pull $IMAGE_TAG || true
|
- docker pull $IMAGE_TAG || true
|
||||||
- docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
- docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||||
--tag $IMAGE_TAG .gitlab-ci.d/edk2
|
--tag $IMAGE_TAG .gitlab-ci.d/edk2
|
||||||
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||||
- docker push $IMAGE_TAG
|
- docker push $IMAGE_TAG
|
||||||
|
|
||||||
build-edk2:
|
build-edk2:
|
||||||
extends: .edk2_job_rules
|
extends: .edk2_job_rules
|
||||||
stage: build
|
stage: build
|
||||||
needs: ['docker-edk2']
|
needs: ['docker-edk2']
|
||||||
artifacts:
|
artifacts:
|
||||||
paths: # 'artifacts.zip' will contains the following files:
|
paths: # 'artifacts.zip' will contains the following files:
|
||||||
- pc-bios/edk2*bz2
|
- pc-bios/edk2*bz2
|
||||||
- pc-bios/edk2-licenses.txt
|
- pc-bios/edk2-licenses.txt
|
||||||
- edk2-stdout.log
|
- edk2-stdout.log
|
||||||
- edk2-stderr.log
|
- edk2-stderr.log
|
||||||
image: $CI_REGISTRY_IMAGE:edk2-cross-build
|
image: $CI_REGISTRY_IMAGE:edk2-cross-build
|
||||||
variables:
|
variables:
|
||||||
GIT_DEPTH: 3
|
GIT_DEPTH: 3
|
||||||
script: # Clone the required submodules and build EDK2
|
script: # Clone the required submodules and build EDK2
|
||||||
- git submodule update --init roms/edk2
|
- git submodule update --init roms/edk2
|
||||||
- git -C roms/edk2 submodule update --init --
|
- git -C roms/edk2 submodule update --init --
|
||||||
ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
|
ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
|
||||||
BaseTools/Source/C/BrotliCompress/brotli
|
BaseTools/Source/C/BrotliCompress/brotli
|
||||||
CryptoPkg/Library/OpensslLib/openssl
|
CryptoPkg/Library/OpensslLib/openssl
|
||||||
MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
|
MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
|
||||||
- export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
|
- export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
|
||||||
- echo "=== Using ${JOBS} simultaneous jobs ==="
|
- echo "=== Using ${JOBS} simultaneous jobs ==="
|
||||||
- make -j${JOBS} -C roms efi 2>&1 1>edk2-stdout.log | tee -a edk2-stderr.log >&2
|
- make -j${JOBS} -C roms efi 2>&1 1>edk2-stdout.log | tee -a edk2-stderr.log >&2
|
||||||
|
|||||||
@ -1,61 +1,61 @@
|
|||||||
# All jobs needing docker-opensbi must use the same rules it uses.
|
# All jobs needing docker-opensbi must use the same rules it uses.
|
||||||
.opensbi_job_rules:
|
.opensbi_job_rules:
|
||||||
rules: # Only run this job when ...
|
rules: # Only run this job when ...
|
||||||
- changes:
|
- changes:
|
||||||
# this file is modified
|
# this file is modified
|
||||||
- .gitlab-ci.d/opensbi.yml
|
- .gitlab-ci.d/opensbi.yml
|
||||||
# or the Dockerfile is modified
|
# or the Dockerfile is modified
|
||||||
- .gitlab-ci.d/opensbi/Dockerfile
|
- .gitlab-ci.d/opensbi/Dockerfile
|
||||||
when: on_success
|
when: on_success
|
||||||
- changes: # or roms/opensbi/ is modified (submodule updated)
|
- changes: # or roms/opensbi/ is modified (submodule updated)
|
||||||
- roms/opensbi/*
|
- roms/opensbi/*
|
||||||
when: on_success
|
when: on_success
|
||||||
- if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi'
|
- if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi'
|
||||||
when: on_success
|
when: on_success
|
||||||
- if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI'
|
- if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI'
|
||||||
when: on_success
|
when: on_success
|
||||||
|
|
||||||
docker-opensbi:
|
docker-opensbi:
|
||||||
extends: .opensbi_job_rules
|
extends: .opensbi_job_rules
|
||||||
stage: containers
|
stage: containers
|
||||||
image: docker:19.03.1
|
image: docker:19.03.1
|
||||||
services:
|
services:
|
||||||
- docker:19.03.1-dind
|
- docker:19.03.1-dind
|
||||||
variables:
|
variables:
|
||||||
GIT_DEPTH: 3
|
GIT_DEPTH: 3
|
||||||
IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build
|
IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build
|
||||||
# We don't use TLS
|
# We don't use TLS
|
||||||
DOCKER_HOST: tcp://docker:2375
|
DOCKER_HOST: tcp://docker:2375
|
||||||
DOCKER_TLS_CERTDIR: ""
|
DOCKER_TLS_CERTDIR: ""
|
||||||
before_script:
|
before_script:
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
script:
|
script:
|
||||||
- docker pull $IMAGE_TAG || true
|
- docker pull $IMAGE_TAG || true
|
||||||
- docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
- docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||||
--tag $IMAGE_TAG .gitlab-ci.d/opensbi
|
--tag $IMAGE_TAG .gitlab-ci.d/opensbi
|
||||||
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||||
- docker push $IMAGE_TAG
|
- docker push $IMAGE_TAG
|
||||||
|
|
||||||
build-opensbi:
|
build-opensbi:
|
||||||
extends: .opensbi_job_rules
|
extends: .opensbi_job_rules
|
||||||
stage: build
|
stage: build
|
||||||
needs: ['docker-opensbi']
|
needs: ['docker-opensbi']
|
||||||
artifacts:
|
artifacts:
|
||||||
paths: # 'artifacts.zip' will contains the following files:
|
paths: # 'artifacts.zip' will contains the following files:
|
||||||
- pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
|
- pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
|
||||||
- pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
|
- pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
|
||||||
- opensbi32-generic-stdout.log
|
- opensbi32-generic-stdout.log
|
||||||
- opensbi32-generic-stderr.log
|
- opensbi32-generic-stderr.log
|
||||||
- opensbi64-generic-stdout.log
|
- opensbi64-generic-stdout.log
|
||||||
- opensbi64-generic-stderr.log
|
- opensbi64-generic-stderr.log
|
||||||
image: $CI_REGISTRY_IMAGE:opensbi-cross-build
|
image: $CI_REGISTRY_IMAGE:opensbi-cross-build
|
||||||
variables:
|
variables:
|
||||||
GIT_DEPTH: 3
|
GIT_DEPTH: 3
|
||||||
script: # Clone the required submodules and build OpenSBI
|
script: # Clone the required submodules and build OpenSBI
|
||||||
- git submodule update --init roms/opensbi
|
- git submodule update --init roms/opensbi
|
||||||
- export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
|
- export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
|
||||||
- echo "=== Using ${JOBS} simultaneous jobs ==="
|
- echo "=== Using ${JOBS} simultaneous jobs ==="
|
||||||
- make -j${JOBS} -C roms/opensbi clean
|
- 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 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/opensbi clean
|
||||||
- make -j${JOBS} -C roms opensbi64-generic 2>&1 1>opensbi64-generic-stdout.log | tee -a opensbi64-generic-stderr.log >&2
|
- make -j${JOBS} -C roms opensbi64-generic 2>&1 1>opensbi64-generic-stdout.log | tee -a opensbi64-generic-stderr.log >&2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user