diff options
-rw-r--r-- | .gitlab-ci.yml | 32 | ||||
-rw-r--r-- | kas/kas-security-base.yml | 1 | ||||
-rw-r--r-- | kas/qemumips64.yml | 6 | ||||
-rwxr-xr-x | scripts/ci-build.sh | 10 |
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: | |||
23 | qemux86: | 23 | qemux86: |
24 | extends: .build | 24 | extends: .build |
25 | script: | 25 | script: |
26 | - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image | 26 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
27 | 27 | ||
28 | qemux86-64: | 28 | qemux86-64: |
29 | extends: .build | 29 | extends: .build |
30 | script: | 30 | script: |
31 | - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image | 31 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
32 | 32 | ||
33 | qemuarm: | 33 | qemuarm: |
34 | extends: .build | 34 | extends: .build |
35 | script: | 35 | script: |
36 | - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image | 36 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
37 | 37 | ||
38 | qemuarm64: | 38 | qemuarm64: |
39 | extends: .build | 39 | extends: .build |
40 | script: | 40 | script: |
41 | - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image | 41 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
42 | 42 | ||
43 | qemumppc: | 43 | qemuppc: |
44 | extends: .build | 44 | extends: .build |
45 | script: | 45 | script: |
46 | - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image | 46 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
47 | 47 | ||
48 | qemumips64: | 48 | qemumips64: |
49 | extends: .build | 49 | extends: .build |
50 | script: | 50 | script: |
51 | - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image | 51 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
52 | 52 | ||
53 | qemuriscv64: | 53 | qemuriscv64: |
54 | extends: .build | 54 | extends: .build |
55 | script: | 55 | script: |
56 | - ./scripts/ci-build.sh $CI_JOB_NAME security-build-image | 56 | - kas build --target security-build-image kas/$CI_JOB_NAME.yml |
57 | 57 | ||
58 | qemux86-64-tpm: | 58 | qemux86-64-tpm: |
59 | extends: .build | 59 | extends: .build |
60 | script: | 60 | script: |
61 | - ./scripts/ci-build.sh $CI_JOB_NAME security-tpm-image | 61 | - kas build --target security-tpm-image kas/$CI_JOB_NAME.yml |
62 | 62 | ||
63 | qemux86-64-tpm2: | 63 | qemux86-64-tpm2: |
64 | extends: .build | 64 | extends: .build |
65 | script: | 65 | script: |
66 | - ./scripts/ci-build.sh $CI_JOB_NAME security-tpm2-image | 66 | - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml |
67 | 67 | ||
68 | qemuarm64-tpm2: | 68 | qemuarm64-tpm2: |
69 | extends: .build | 69 | extends: .build |
70 | script: | 70 | script: |
71 | - ./scripts/ci-build.sh $CI_JOB_NAME security-tpm2-image | 71 | - kas build --target security-tpm2-image kas/$CI_JOB_NAME.yml |
72 | |||
73 | 72 | ||
74 | qemux86-ima: | 73 | qemux86-ima: |
75 | extends: .build | 74 | extends: .build |
76 | script: | 75 | script: |
77 | - ./scripts/ci-build.sh $CI_JOB_NAME integrity-image-minimal | 76 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml |
78 | 77 | ||
79 | qemux86-64-ima: | 78 | qemux86-64-ima: |
80 | extends: .build | 79 | extends: .build |
81 | script: | 80 | script: |
82 | - ./scripts/ci-build.sh $CI_JOB_NAME integrity-image-minimal | 81 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml |
83 | 82 | ||
84 | qemuarm64-iam: | 83 | qemuarm64-ima: |
85 | extends: .build | 84 | extends: .build |
86 | script: | 85 | script: |
87 | - ./scripts/ci-build.sh $CI_JOB_NAME integrity-image-minimal | 86 | - kas build --target integrity-image-minimal kas/$CI_JOB_NAME.yml |
88 | |||
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 | |||
6 | repos: | 6 | repos: |
7 | meta-security: | 7 | meta-security: |
8 | layers: | 8 | layers: |
9 | ../meta-security: | ||
9 | meta-tpm: | 10 | meta-tpm: |
10 | meta-integrity: | 11 | meta-integrity: |
11 | meta-security-compliance: | 12 | 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 @@ | |||
1 | header: | ||
2 | version: 8 | ||
3 | includes: | ||
4 | - kas-security-base.yml | ||
5 | |||
6 | 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 @@ | |||
1 | #! /bin/bash | ||
2 | |||
3 | set -e | ||
4 | |||
5 | CONF=$1 | ||
6 | shift 1 | ||
7 | IMAGES=$@ | ||
8 | |||
9 | ( kas shell kas/${CONF}.yml -c "bitbake --setscene-only ${IMAGES}" || true ) | sed -e '/^NOTE: .*Started$/d' -e '/^NOTE: Running /d' | ||
10 | kas shell kas/${CONF}.yml -c "bitbake --skip-setscene ${IMAGES}" | sed -e '/^NOTE: .*Started$/d' -e '/^NOTE: Running /d' | ||