From 03437efb76137d2ef0f5e0670a13d095008fc780 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 18 Apr 2021 07:25:23 -0700 Subject: gitlab-ci: move tpm build Signed-off-by: Armin Kuster --- .gitlab-ci.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f155ba0..c92ed31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,8 @@ qemux86: extends: .build script: - kas build --target security-build-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_NAME.yml - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml @@ -47,6 +49,7 @@ qemuarm64: extends: .build script: - kas build --target security-build-image kas/$CI_JOB_NAME.yml + - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml - kas build --target integrity-image-minimal kas/$CI_JOB_NAME-ima.yml qemuppc: @@ -64,17 +67,6 @@ qemuriscv64: script: - 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 - - 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 - qemuarm64-alt: extends: .build script: -- cgit v1.2.3-54-g00ecf