summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2023-06-14 09:15:48 -0400
committerArmin Kuster <akuster808@gmail.com>2023-06-20 11:07:20 -0400
commit97ab23ef6401ae9bcb2c4cfd4fb01b3ca6522c79 (patch)
treee60697992a24806b62df68b5272ca2ef56b6a56b
parent6ae25c767337b0659544d0b5a2e46b4e73a5b069 (diff)
downloadmeta-security-97ab23ef6401ae9bcb2c4cfd4fb01b3ca6522c79.tar.gz
kas: ci changes do to meta-security-compliance being removed
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--kas/kas-security-base.yml1
-rw-r--r--kas/qemux86-comp.yml11
3 files changed, 0 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4137cb..1e82a87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,6 @@ qemux86:
52 extends: .base 52 extends: .base
53 script: 53 script:
54 - kas shell kas/$CI_JOB_NAME.yml -c "bitbake -k security-build-image integrity-image-minimal" 54 - kas shell kas/$CI_JOB_NAME.yml -c "bitbake -k security-build-image integrity-image-minimal"
55 - kas build --target security-build-image kas/$CI_JOB_NAME-comp.yml
56 - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml 55 - kas build --target harden-image-minimal kas/$CI_JOB_NAME-harden.yml
57 56
58qemux86-musl: 57qemux86-musl:
diff --git a/kas/kas-security-base.yml b/kas/kas-security-base.yml
index e7abb3c..fa7915c 100644
--- a/kas/kas-security-base.yml
+++ b/kas/kas-security-base.yml
@@ -9,7 +9,6 @@ repos:
9 ../meta-security: 9 ../meta-security:
10 meta-tpm: 10 meta-tpm:
11 meta-integrity: 11 meta-integrity:
12 meta-security-compliance:
13 meta-hardening: 12 meta-hardening:
14 13
15 poky: 14 poky:
diff --git a/kas/qemux86-comp.yml b/kas/qemux86-comp.yml
deleted file mode 100644
index 478d631..0000000
--- a/kas/qemux86-comp.yml
+++ /dev/null
@@ -1,11 +0,0 @@
1header:
2 version: 8
3 includes:
4 - kas-security-base.yml
5
6local_conf_header:
7 meta-compliance: |
8 IMAGE_INSTALL:append = " lynis"
9 IMAGE_INSTALL:append = " openscap openscap-daemon scap-security-guide"
10
11machine: qemux86