diff mbox series

[isar-cip-core,5/5] ci: Reduce number of build tests, focus on bookworm

Message ID e2a5394de5915a3e1a5d7610111ce6cc52b5e37c.1695291811.git.jan.kiszka@siemens.com (mailing list archive)
State Accepted
Headers show
Series Switch kernel downloads, make bookworm default, refine CI targets | expand

Commit Message

Jan Kiszka Sept. 21, 2023, 10:23 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Flip the default to bookworm and only have one target for
arm/arm64/amd64 for the old bullseye and buster releases. Helps to focus
on the main development area and shortens our pipeline.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .gitlab-ci.yml | 76 +++++++++++++++-----------------------------------
 1 file changed, 23 insertions(+), 53 deletions(-)
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ccd6171..1de6570b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@  image: ghcr.io/siemens/kas/kas-isar:4.0
 
 variables:
   GIT_STRATEGY: clone
-  release: bullseye
+  release: bookworm
   extension: none
   use_rt: enable
   encrypt: disable
@@ -270,22 +270,36 @@  build:qemu-arm-secure-boot:
     wic_targz: disable
     deploy: disable
 
-# buster images
-build:simatic-ipc227e-buster:
+# bullseye images
+build:iwg20m-bullseye:
   extends:
     - .build_base
   variables:
-    target: simatic-ipc227e
-    release: buster
+    target: iwg20m
+    dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
+    release: bullseye
 
-build:bbb-buster:
+build:hihope-rzg2m-bullseye:
   extends:
     - .build_base
   variables:
-    target: bbb
-    dtb: am335x-boneblack.dtb
-    release: buster
+    target: hihope-rzg2m
+    dtb: r8a774a1-hihope-rzg2m-ex.dtb
+    release: bullseye
 
+build:qemu-amd64-secure-boot-bullseye:
+  extends:
+    - .build_base
+  variables:
+    base_yaml: "kas-cip.yml:kas/board/${target}.yml"
+    release: bullseye
+    target: qemu-amd64
+    extension: ebg-secure-boot-snakeoil
+    use_rt: disable
+    wic_targz: disable
+    deploy: disable
+
+# buster images
 build:iwg20m-buster:
   extends:
     - .build_base
@@ -328,47 +342,3 @@  build:qemu-riscv64:
   allow_failure: true
 
 include: '.reproducible-check-ci.yml'
-
-# bookworm images
-build:simatic-ipc227e-bookworm:
-  extends:
-    - .build_base
-  variables:
-    target: simatic-ipc227e
-    release: bookworm
-
-build:bbb-bookworm:
-  extends:
-    - .build_base
-  variables:
-    target: bbb
-    dtb: am335x-boneblack.dtb
-    release: bookworm
-
-build:iwg20m-bookworm:
-  extends:
-    - .build_base
-  variables:
-    target: iwg20m
-    dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
-    release: bookworm
-
-build:hihope-rzg2m-bookworm:
-  extends:
-    - .build_base
-  variables:
-    target: hihope-rzg2m
-    dtb: r8a774a1-hihope-rzg2m-ex.dtb
-    release: bookworm
-
-build:qemu-amd64-secure-boot-bookworm:
-  extends:
-    - .build_base
-  variables:
-    base_yaml: "kas-cip.yml:kas/board/${target}.yml"
-    release: bookworm
-    target: qemu-amd64
-    extension: ebg-secure-boot-snakeoil
-    use_rt: disable
-    wic_targz: disable
-    deploy: disable