From 32dacb1f8d1ea80df0f886c77234bbb21aa2da14 Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Sun, 25 Jul 2021 07:36:51 -0700
Subject: gitlab-ci.yml:  streamline builds matrix

drop ppc32 builds
drop multi builds

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .gitlab-ci.yml           | 38 --------------------------------------
 kas/qemuarm64-multi.yml  | 12 ------------
 kas/qemuppc-parsec.yml   |  6 ------
 kas/qemuppc.yml          |  6 ------
 kas/qemux86-64-multi.yml | 12 ------------
 5 files changed, 74 deletions(-)
 delete mode 100644 kas/qemuarm64-multi.yml
 delete mode 100644 kas/qemuppc-parsec.yml
 delete mode 100644 kas/qemuppc.yml
 delete mode 100644 kas/qemux86-64-multi.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 762ba66..a4137cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,6 @@
 stages:
   - base 
   - parsec
-  - multi
   - musl
   - test
 
@@ -35,14 +34,6 @@ stages:
   after_script:
     - *after-my-script
 
-
-.multi:
-  before_script:
-    - *before-my-script
-  stage: multi
-  after_script:
-    - *after-my-script
-
 .musl:
   before_script:
     - *before-my-script
@@ -97,12 +88,6 @@ qemux86-64-parsec:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemux86-64-multi:
-  extends: .multi
-  needs: ['qemux86-64']
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
 qemuarm:
   extends: .base
   script:
@@ -120,12 +105,6 @@ qemuarm64:
   - kas shell kas/$CI_JOB_NAME.yml  -c "bitbake -k security-build-image security-tpm2-image integrity-image-minimal"
   - kas build --target security-build-image kas/$CI_JOB_NAME-alt.yml
 
-qemuarm64-multi:
-  extends: .multi
-  needs: ['qemuarm64']
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
 qemuarm64-musl:
   extends: .musl
   needs: ['qemuarm64']
@@ -138,28 +117,11 @@ qemuarm64-parsec:
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemuppc:
-  extends: .base
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
-qemuppc-parsec:
-  extends: .parsec
-  needs: ['qemuppc']
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
 qemumips64:
   extends: .base
   script:
   - kas build --target security-build-image kas/$CI_JOB_NAME.yml
 
-qemumips64-multi:
-  extends: .multi
-  needs: ['qemumips64']
-  script:
-  - kas build --target security-build-image kas/$CI_JOB_NAME.yml
-
 qemuriscv64:
   extends: .base
   script:
diff --git a/kas/qemuarm64-multi.yml b/kas/qemuarm64-multi.yml
deleted file mode 100644
index d79142c..0000000
--- a/kas/qemuarm64-multi.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-header:
-  version: 8
-  includes:
-    - kas-security-base.yml
-
-local_conf_header:
-  multi: |
-    require conf/multilib.conf
-    MULTILIBS = "multilib:lib32"
-    DEFAULTTUNE_virtclass-multilib-lib32 = "armv7athf-neon"
-
-machine: qemuarm64
diff --git a/kas/qemuppc-parsec.yml b/kas/qemuppc-parsec.yml
deleted file mode 100644
index 1176d13..0000000
--- a/kas/qemuppc-parsec.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-header:
-  version: 8
-  includes:
-    - kas-security-parsec.yml
-
-machine: qemuppc
diff --git a/kas/qemuppc.yml b/kas/qemuppc.yml
deleted file mode 100644
index 3dad81c..0000000
--- a/kas/qemuppc.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-header:
-  version: 8
-  includes:
-    - kas-security-base.yml
-
-machine: qemuppc
diff --git a/kas/qemux86-64-multi.yml b/kas/qemux86-64-multi.yml
deleted file mode 100644
index 711ce28..0000000
--- a/kas/qemux86-64-multi.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-header:
-  version: 8
-  includes:
-    - kas-security-base.yml
-
-local_conf_header:
-  multi: |
-    require conf/multilib.conf
-    MULTILIBS = "multilib:lib32"
-    DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
-
-machine: qemux86-64
-- 
cgit v1.2.3-54-g00ecf