From 6f763e6c5846b9d9df2793c2817032fd76c8397c Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 10 Apr 2021 12:20:25 -0700 Subject: .gitlab-ci.yml: reorder to speed up builds Also clean up extra spaces Signed-off-by: Armin Kuster --- .gitlab-ci.yml | 111 ++++++++++++++++----------------------------------------- 1 file changed, 31 insertions(+), 80 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 323285a..04a28bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,153 +26,104 @@ stages: qemux86: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml + - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml + - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml + - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml qemux86-64: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml + - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME-dm-verify.yml + - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml qemuarm: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml qemuarm64: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml + - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml qemuppc: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME-parsec.yml qemumips64: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemuriscv64: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemux86-64-tpm: extends: .build script: - - kas build --target security-tpm-image kas/$CI_JOB_NAME.yml - -qemux86-64-tpm2: - extends: .build - script: - - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml + - kas build --target security-tpm-image kas/$CI_JOB_NAME.yml + - kas build --target security-tpm2-image kas/$CI_JOB_NAME2.yml qemuarm64-tpm2: extends: .build script: - - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml - -qemux86-ima: - extends: .build - script: - - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml - -qemux86-64-ima: - extends: .build - script: - - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml - -qemuarm64-ima: - extends: .build - script: - - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml - -qemux86-64-dm-verify: - extends: .build - script: - - kas build --target core-image-minimal kas/qemux86-64.yml - - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME.yml - + - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml qemuarm64-alt: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemuarm64-multi: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemumips64-alt: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemumips64-multi: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemux86-64-alt: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemux86-64-multi: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemux86-musl: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemuarm64-musl: extends: .build script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml - -qemux86-harden: - extends: .build - script: - - kas build --target harden-image-minimal kas/$CI_JOB_NAME.yml - -qemux86-comp: - extends: .build - script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-build-image kas/$CI_JOB_NAME.yml qemux86-test: extends: .build allow_failure: true script: - - kas build --target security-test-image kas/$CI_JOB_NAME.yml - - kas build -c testimage --target security-test-image kas/$CI_JOB_NAME.yml - -qemux86-parsec: - extends: .build - script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml - -qemux86-64-parsec: - extends: .build - script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-test-image kas/$CI_JOB_NAME.yml + - kas build -c testimage --target security-test-image kas/$CI_JOB_NAME.yml -qemuarm-parsec: - extends: .build - script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml - -qemuarm-64-parsec: - extends: .build - script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml - -qemuppc-parsec: - extends: .build - script: - - kas build --target security-build-image kas/$CI_JOB_NAME.yml -- cgit v1.2.3-54-g00ecf