ci: Shuffle cross-building jobs around

Keep them ordered by architecture, the same way the corresponding
container jobs are, to make it easier to jump between the two
sections and compare them.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5779b1b8b2ba46ab6c6078812b25790fe8282e86..4f6cd60d515b505f671ff677f0469fca8dcc4165 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -435,6 +435,14 @@ x64-macos-1015-build:
 
 # Cross compiled build jobs
 
+aarch64-debian-10:
+  extends: .cross_build_job
+  needs:
+    - aarch64-debian-10-container
+  variables:
+    NAME: debian-10
+    CROSS: aarch64
+
 armv6l-debian-10:
   extends: .cross_build_job
   needs:
@@ -451,13 +459,13 @@ armv7l-debian-10:
     NAME: debian-10
     CROSS: armv7l
 
-mips64el-debian-10:
+i686-debian-sid:
   extends: .cross_build_job
   needs:
-    - mips64el-debian-10-container
+    - i686-debian-sid-container
   variables:
-    NAME: debian-10
-    CROSS: mips64el
+    NAME: debian-sid
+    CROSS: i686
 
 mips-debian-10:
   extends: .cross_build_job
@@ -467,13 +475,13 @@ mips-debian-10:
     NAME: debian-10
     CROSS: mips
 
-aarch64-debian-10:
+mips64el-debian-10:
   extends: .cross_build_job
   needs:
-    - aarch64-debian-10-container
+    - mips64el-debian-10-container
   variables:
     NAME: debian-10
-    CROSS: aarch64
+    CROSS: mips64el
 
 mipsel-debian-10:
   extends: .cross_build_job
@@ -483,29 +491,21 @@ mipsel-debian-10:
     NAME: debian-10
     CROSS: mipsel
 
-s390x-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - s390x-debian-sid-container
-  variables:
-    NAME: debian-sid
-    CROSS: s390x
-
-i686-debian-sid:
+ppc64le-debian-sid:
   extends: .cross_build_job
   needs:
-    - i686-debian-sid-container
+    - ppc64le-debian-sid-container
   variables:
     NAME: debian-sid
-    CROSS: i686
+    CROSS: ppc64le
 
-ppc64le-debian-sid:
+s390x-debian-sid:
   extends: .cross_build_job
   needs:
-    - ppc64le-debian-sid-container
+    - s390x-debian-sid-container
   variables:
     NAME: debian-sid
-    CROSS: ppc64le
+    CROSS: s390x
 
 mingw32-fedora-rawhide:
   extends: .cross_build_job