gitlab: rename the cross build jobs

The pipeline UI will truncate the names of jobs after about 15
characters. As a result with the cross-builds, we truncate the
most important part of the job name. Putting the most important
part first is robust against truncation, and we can drop the
redundant "-cross" stub.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d66b30edb04f07cef2e015d647f361d30bf24a9c..ec4f5633784568c59bfbb1d7ac12d57428ce15bb 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,39 +25,39 @@ stages:
     - /^ci-full-.*$/
 
 
-debian-9-cross-armv6l:
+armv6l-debian-9:
   <<: *cross_build_extra_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-9-cross-armv6l:latest
 
-debian-9-cross-mips64el:
+mips64el-debian-9:
   <<: *cross_build_extra_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-9-cross-mips64el:latest
 
-debian-9-cross-mips:
+mips-debian-9:
   <<: *cross_build_extra_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-9-cross-mips:latest
 
-debian-10-cross-aarch64:
+aarch64-debian-10:
   <<: *cross_build_extra_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-10-cross-aarch64:latest
 
-debian-10-cross-ppc64le:
+ppc64le-debian-10:
   <<: *cross_build_extra_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-10-cross-ppc64le:latest
 
-debian-10-cross-s390x:
+s390x-debian-10:
   <<: *cross_build_default_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-10-cross-s390x:latest
 
-debian-sid-cross-armv7l:
+armv7l-debian-sid:
   <<: *cross_build_default_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-armv7l:latest
 
-debian-sid-cross-i686:
+i686-debian-sid:
   <<: *cross_build_extra_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-i686:latest
 
-debian-sid-cross-mipsel:
+mipsel-debian-sid:
   <<: *cross_build_extra_job_definition
   image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-mipsel:latest