aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2020-07-20 15:20:32 -0700
committerArmin Kuster <akuster808@gmail.com>2020-07-24 09:59:33 -0700
commit066a04425c318dd20dfe7806a5aa976e377a39a5 (patch)
tree301ea8da3c1f7286f8dba0bde3a2a4fe81fa43d6
parent4dc69a75502cb8f184b003e13117999f136b7899 (diff)
downloadmeta-security-066a04425c318dd20dfe7806a5aa976e377a39a5.tar.gz
meta-security-066a04425c318dd20dfe7806a5aa976e377a39a5.tar.bz2
meta-security-066a04425c318dd20dfe7806a5aa976e377a39a5.zip
drop ci-build: it is hiding errors
call kas from .gitlab-ci fix typos add missing mips64 file add main layer workaround Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--.gitlab-ci.yml32
-rw-r--r--kas/kas-security-base.yml1
-rw-r--r--kas/qemumips64.yml6
-rwxr-xr-xscripts/ci-build.sh10
4 files changed, 22 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6fba3e..132eb78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,66 +23,64 @@ stages:
qemux86:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
qemux86-64:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
qemuarm:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
qemuarm64:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-qemumppc:
+qemuppc:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
qemumips64:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
qemuriscv64:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
qemux86-64-tpm:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-tpm-image
+ - kas build --target security-tpm-image kas/$CI_JOB_NAME.yml
qemux86-64-tpm2:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-tpm2-image
+ - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml
qemuarm64-tpm2:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME security-tpm2-image
-
+ - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml
qemux86-ima:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME integrity-image-minimal
+ - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml
qemux86-64-ima:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME integrity-image-minimal
+ - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml
-qemuarm64-iam:
+qemuarm64-ima:
extends: .build
script:
- - ./scripts/ci-build.sh $CI_JOB_NAME integrity-image-minimal
-
+ - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml
diff --git a/kas/kas-security-base.yml b/kas/kas-security-base.yml
index 82072ef..768390e 100644
--- a/kas/kas-security-base.yml
+++ b/kas/kas-security-base.yml
@@ -6,6 +6,7 @@ distro: poky
repos:
meta-security:
layers:
+ ../meta-security:
meta-tpm:
meta-integrity:
meta-security-compliance:
diff --git a/kas/qemumips64.yml b/kas/qemumips64.yml
new file mode 100644
index 0000000..64e52f7
--- /dev/null
+++ b/kas/qemumips64.yml
@@ -0,0 +1,6 @@
+header:
+ version: 8
+ includes:
+ - kas-security-base.yml
+
+machine: qemumips64
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
deleted file mode 100755
index b6f1dda..0000000
--- a/scripts/ci-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-set -e
-
-CONF=$1
-shift 1
-IMAGES=$@
-
-( kas shell kas/${CONF}.yml -c "bitbake --setscene-only ${IMAGES}" || true ) | sed -e '/^NOTE: .*Started$/d' -e '/^NOTE: Running /d'
-kas shell kas/${CONF}.yml -c "bitbake --skip-setscene ${IMAGES}" | sed -e '/^NOTE: .*Started$/d' -e '/^NOTE: Running /d'