Debian sid is currently broken on mips64el, so use Debian 10 for
that specific build and move a different architecture (armv7l)
from Debian 10 to Debian sid to maintain the rough 1:1 split.

Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
---
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/355057402

Just started, but I'm optimistic about the outcome :)

 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1609c260d..c1bca36a93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -225,7 +225,7 @@ armv6l-debian-10-container:
     NAME: debian-10-cross-armv6l
 
 armv7l-debian-10-container:
-  extends: .container_job
+  extends: .container_optional_job
   variables:
     NAME: debian-10-cross-armv7l
 
@@ -240,7 +240,7 @@ mips-debian-10-container:
     NAME: debian-10-cross-mips
 
 mips64el-debian-10-container:
-  extends: .container_optional_job
+  extends: .container_job
   variables:
     NAME: debian-10-cross-mips64el
 
@@ -270,7 +270,7 @@ armv6l-debian-sid-container:
     NAME: debian-sid-cross-armv6l
 
 armv7l-debian-sid-container:
-  extends: .container_optional_job
+  extends: .container_job
   variables:
     NAME: debian-sid-cross-armv7l
 
@@ -280,7 +280,7 @@ i686-debian-sid-container:
     NAME: debian-sid-cross-i686
 
 mips64el-debian-sid-container:
-  extends: .container_job
+  extends: .container_optional_job
   variables:
     NAME: debian-sid-cross-mips64el
 
@@ -473,12 +473,12 @@ armv6l-debian-10:
     NAME: debian-10
     CROSS: armv6l
 
-armv7l-debian-10:
+armv7l-debian-sid:
   extends: .cross_build_job
   needs:
-    - armv7l-debian-10-container
+    - armv7l-debian-sid-container
   variables:
-    NAME: debian-10
+    NAME: debian-sid
     CROSS: armv7l
 
 i686-debian-sid:
@@ -497,12 +497,12 @@ mips-debian-10:
     NAME: debian-10
     CROSS: mips
 
-mips64el-debian-sid:
+mips64el-debian-10:
   extends: .cross_build_job
   needs:
-    - mips64el-debian-sid-container
+    - mips64el-debian-10-container
   variables:
-    NAME: debian-sid
+    NAME: debian-10
     CROSS: mips64el
 
 mipsel-debian-10:
-- 
2.31.1

Reply via email to