Skip to contentSkip to conversation

drop ci-build: it is hiding errors

PATCH New akuster 1 participant 1 message Jul 24, 2020

lore
Share & tools
lore

akuster

author
#0 lore raw

PATCH 1/1 drop ci-build: it is hiding errors

call kas from .gitlab-ci
fix typos
add missing mips64 file
add main layer workaround

---
 .gitlab-ci.yml            | 32 +++++++++++++++-----------------
 kas/kas-security-base.yml |  1 +
 kas/qemumips64.yml        |  6 ++++++
 scripts/ci-build.sh       | 10 ----------
 4 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100644 kas/qemumips64.yml
 delete mode 100755 scripts/ci-build.sh
.gitlab-ci.yml +15 -17
index c6fba3e..132eb78 100644
@@ -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 
kas/kas-security-base.yml +1 -0
index 82072ef..768390e 100644
@@ -6,6 +6,7 @@ distro: poky
 repos:
   meta-security:
     layers:
+      ../meta-security:
       meta-tpm:
       meta-integrity:
       meta-security-compliance:
kas/qemumips64.yml new file +6 -0
new file mode 100644
index 0000000..64e52f7
@@ -0,0 +1,6 @@
+header:
+  version: 8
+  includes:
+    - kas-security-base.yml
+
+machine: qemumips64
scripts/ci-build.sh deleted +0 -10
deleted file mode 100755
index b6f1dda..0000000
@@ -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'
Signature · 1 line
2.17.1