ci: eliminate many cross arch CI builds

We currently build cross-arch containers for all three Debian
releases (10, 11, Sid), and do libvirt builds covering each
arch. This is overkill in terms of the number of problems it
identifies. The most important aspect of cross arch builds is
to find problems with 32-bit builds and problems with big
endian builds.

With this in mind the cross arch jobs are altered as follows

 - Debian 10
     - build the containers by default
     - build armv7 (32-bit) & s390x (big endian)
     - other arch builds manual

 - Debian 11 / Sid
     - container builds all optional
     - arch builds all optional

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index a1183abb8d2d491eac42e6835c6fb0445ea34303..62a6aa1db482d8351c25eb81cc685737d3ad8817 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -256,9 +256,10 @@ armv6l-debian-10:
   needs:
     - job: armv6l-debian-10-container
       optional: true
-  allow_failure: false
+  allow_failure: true
   variables:
     CROSS: armv6l
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-10
 
 
@@ -267,10 +268,9 @@ armv7l-debian-10:
   needs:
     - job: armv7l-debian-10-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: armv7l
-    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-10
 
 
@@ -291,9 +291,10 @@ mips-debian-10:
   needs:
     - job: mips-debian-10-container
       optional: true
-  allow_failure: false
+  allow_failure: true
   variables:
     CROSS: mips
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-10
 
 
@@ -314,9 +315,10 @@ mipsel-debian-10:
   needs:
     - job: mipsel-debian-10-container
       optional: true
-  allow_failure: false
+  allow_failure: true
   variables:
     CROSS: mipsel
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-10
 
 
@@ -349,7 +351,7 @@ aarch64-debian-11:
   needs:
     - job: aarch64-debian-11-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: aarch64
     LIBVIRT_JOB_OPTIONAL: 1
@@ -361,7 +363,7 @@ armv6l-debian-11:
   needs:
     - job: armv6l-debian-11-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: armv6l
     LIBVIRT_JOB_OPTIONAL: 1
@@ -376,6 +378,7 @@ armv7l-debian-11:
   allow_failure: false
   variables:
     CROSS: armv7l
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11
 
 
@@ -384,7 +387,7 @@ i686-debian-11:
   needs:
     - job: i686-debian-11-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: i686
     LIBVIRT_JOB_OPTIONAL: 1
@@ -399,6 +402,7 @@ mips64el-debian-11:
   allow_failure: false
   variables:
     CROSS: mips64el
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11
 
 
@@ -407,7 +411,7 @@ mipsel-debian-11:
   needs:
     - job: mipsel-debian-11-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: mipsel
     LIBVIRT_JOB_OPTIONAL: 1
@@ -422,6 +426,7 @@ ppc64le-debian-11:
   allow_failure: false
   variables:
     CROSS: ppc64le
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11
 
 
@@ -430,7 +435,7 @@ s390x-debian-11:
   needs:
     - job: s390x-debian-11-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: s390x
     LIBVIRT_JOB_OPTIONAL: 1
@@ -442,9 +447,10 @@ aarch64-debian-sid:
   needs:
     - job: aarch64-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: aarch64
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid
 
 
@@ -453,7 +459,7 @@ armv6l-debian-sid:
   needs:
     - job: armv6l-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: armv6l
     LIBVIRT_JOB_OPTIONAL: 1
@@ -465,7 +471,7 @@ armv7l-debian-sid:
   needs:
     - job: armv7l-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: armv7l
     LIBVIRT_JOB_OPTIONAL: 1
@@ -477,9 +483,10 @@ i686-debian-sid:
   needs:
     - job: i686-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: i686
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid
 
 
@@ -488,7 +495,7 @@ mips64el-debian-sid:
   needs:
     - job: mips64el-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: mips64el
     LIBVIRT_JOB_OPTIONAL: 1
@@ -500,7 +507,7 @@ mipsel-debian-sid:
   needs:
     - job: mipsel-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: mipsel
     LIBVIRT_JOB_OPTIONAL: 1
@@ -512,7 +519,7 @@ ppc64le-debian-sid:
   needs:
     - job: ppc64le-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: ppc64le
     LIBVIRT_JOB_OPTIONAL: 1
@@ -524,9 +531,10 @@ s390x-debian-sid:
   needs:
     - job: s390x-debian-sid-container
       optional: true
-  allow_failure: true
+  allow_failure: false
   variables:
     CROSS: s390x
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid
 
 

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 37c179c4392bb6cf32747f3dfda89d9a543bc98b..7cdf3eb9a082a3549fe2fbb2644d354a2730cbca 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -131,14 +131,14 @@ aarch64-debian-10-container:
 
 armv6l-debian-10-container:
   extends: .container_job
-  allow_failure: false
+  allow_failure: true
   variables:
     NAME: debian-10-cross-armv6l
 
 
 armv7l-debian-10-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
     NAME: debian-10-cross-armv7l
 
@@ -152,7 +152,7 @@ i686-debian-10-container:
 
 mips-debian-10-container:
   extends: .container_job
-  allow_failure: false
+  allow_failure: true
   variables:
     NAME: debian-10-cross-mips
 
@@ -166,7 +166,7 @@ mips64el-debian-10-container:
 
 mipsel-debian-10-container:
   extends: .container_job
-  allow_failure: false
+  allow_failure: true
   variables:
     NAME: debian-10-cross-mipsel
 
@@ -187,15 +187,17 @@ s390x-debian-10-container:
 
 aarch64-debian-11-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-aarch64
 
 
 armv6l-debian-11-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-armv6l
 
 
@@ -203,13 +205,15 @@ armv7l-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-armv7l
 
 
 i686-debian-11-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-i686
 
 
@@ -217,13 +221,15 @@ mips64el-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-mips64el
 
 
 mipsel-debian-11-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-mipsel
 
 
@@ -231,69 +237,79 @@ ppc64le-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-ppc64le
 
 
 s390x-debian-11-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-11-cross-s390x
 
 
 aarch64-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-aarch64
 
 
 armv6l-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-armv6l
 
 
 armv7l-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-armv7l
 
 
 i686-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-i686
 
 
 mips64el-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-mips64el
 
 
 mipsel-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-mipsel
 
 
 ppc64le-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-ppc64le
 
 
 s390x-debian-sid-container:
   extends: .container_job
-  allow_failure: true
+  allow_failure: false
   variables:
+    LIBVIRT_JOB_OPTIONAL: 1
     NAME: debian-sid-cross-s390x
 
 

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 97de2d78229e79289327ed57ca93eb3828622cc0..6e35107fdda437fe8482d56ad41bee924409d31e 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -56,22 +56,26 @@ targets:
         builds: false
 
       - arch: armv6l
-
-      - arch: armv7l
         allow-failure: true
         builds: false
 
+      - arch: armv7l
+
       - arch: i686
         allow-failure: true
         builds: false
 
       - arch: mips
+        allow-failure: true
+        builds: false
 
       - arch: mips64el
         allow-failure: true
         builds: false
 
       - arch: mipsel
+        allow-failure: true
+        builds: false
 
       - arch: ppc64le
         allow-failure: true
@@ -90,29 +94,35 @@ targets:
         suffix: -clang
 
       - arch: aarch64
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: armv6l
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: armv7l
+        containers: false
+        builds: false
 
       - arch: i686
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: mips64el
+        containers: false
+        builds: false
 
       - arch: mipsel
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: ppc64le
+        containers: false
+        builds: false
 
       - arch: s390x
-        allow-failure: true
+        containers: false
         builds: false
 
   debian-sid:
@@ -121,33 +131,36 @@ targets:
         allow-failure: true
 
       - arch: aarch64
-        allow-failure: true
+        containers: false
+        builds: false
 
       - arch: armv6l
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: armv7l
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: i686
-        allow-failure: true
+        containers: false
+        builds: false
 
       - arch: mips64el
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: mipsel
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: ppc64le
-        allow-failure: true
+        containers: false
         builds: false
 
       - arch: s390x
-        allow-failure: true
+        containers: false
+        builds: false
 
   fedora-35:
     jobs: