diff options
| author | Armin Kuster <akuster808@gmail.com> | 2021-04-19 06:41:31 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-04-20 07:41:29 -0700 |
| commit | caeeb4fb24d68d0bcf36d9135f063eaf05b712c1 (patch) | |
| tree | 6963594274a2b5010954ea09e2599b62a6f939fa | |
| parent | 881d441f71734c8f979966e73bc5a6def3ae050c (diff) | |
| download | meta-security-caeeb4fb24d68d0bcf36d9135f063eaf05b712c1.tar.gz | |
.gitlab-ci: use kas shell in some cases.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71569b8..3211025 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
| @@ -71,8 +71,6 @@ qemux86: | |||
| 71 | extends: .build | 71 | extends: .build |
| 72 | script: | 72 | script: |
| 73 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml | 73 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
| 74 | - kas build --target security-tpm-image kas/$CI_JOB_NAME.yml | ||
| 75 | - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml | ||
| 76 | - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml | 74 | - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml |
| 77 | - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml | 75 | - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml |
| 78 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml | 76 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml |
| @@ -80,7 +78,7 @@ qemux86: | |||
| 80 | qemux86-64: | 78 | qemux86-64: |
| 81 | extends: .build | 79 | extends: .build |
| 82 | script: | 80 | script: |
| 83 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml | 81 | - kas shell kas/$CI_JOB_NAME.yml -c "bitbake -k security-build-image security-tpm-image security-tpm2-image" |
| 84 | - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME-dm-verify.yml | 82 | - kas build --target dm-verity-image-initramfs kas/$CI_JOB_NAME-dm-verify.yml |
| 85 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml | 83 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml |
| 86 | 84 | ||
| @@ -92,8 +90,7 @@ qemuarm: | |||
| 92 | qemuarm64: | 90 | qemuarm64: |
| 93 | extends: .build | 91 | extends: .build |
| 94 | script: | 92 | script: |
| 95 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml | 93 | - kas shell kas/$CI_JOB_NAME.yml -c "bitbake -k security-build-image security-tpm2-image" |
| 96 | - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml | ||
| 97 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml | 94 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml |
| 98 | 95 | ||
| 99 | qemuppc: | 96 | qemuppc: |