[Libguestfs] [libnbd PATCH 1/3] ci: Simplify and fix .gitlab.yml

[Martin Kletzander]

No need for .native_build_job, that is decided with the env var CROSS which is
set when running the container.  And cross builds should use the proper image
name.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 .gitlab-ci.yml | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a90c25956ca4..8976015b1e20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,7 @@ stages:
 
 .base_build_job:
   stage: builds
+  image: $CI_REGISTRY_IMAGE/$NAME:latest
   cache:
     paths:
       - ccache/
@@ -51,10 +52,6 @@ stages:
     public: true
     when: always
 
-.native_build_job:
-  extends: .base_build_job
-  image: $CI_REGISTRY_IMAGE/$NAME:latest
-
 # Jobs that we delegate to Cirrus CI because they require an operating
 # system other than Linux. These jobs will only run if the required
 # setup has been performed on the GitLab account (see ci/README.rst).
@@ -175,59 +172,59 @@ x64-ubuntu-2004-container:
 
 # Cross-compilation build jobs
 i686-debian-10:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - i686-debian-10-container
   variables:
-    NAME: debian-10
+    NAME: debian-10-cross-i686
     CROSS: i686
 
 i686-debian-11:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - i686-debian-11-container
   variables:
-    NAME: debian-11
+    NAME: debian-11-cross-i686
     CROSS: i686
 
 # Native architecture build + test jobs
 x64-debian-11:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-debian-11-container
   variables:
     NAME: debian-11
 
 x64-debian-sid:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-debian-sid-container
   variables:
     NAME: debian-sid
 
 x64-centos-8:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-centos-8-container
   variables:
     NAME: centos-8
 
 x64-alpine-314:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-alpine-314-container
   variables:
     NAME: alpine-314
 
 x64-alpine-edge:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-alpine-edge-container
   variables:
     NAME: alpine-edge
 
 x64-centos-8-clang:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-centos-8-container
   variables:
@@ -235,35 +232,35 @@ x64-centos-8-clang:
     CC: clang
 
 x64-centos-stream-8:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-centos-stream-8-container
   variables:
     NAME: centos-stream-8
 
 x64-fedora-33:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-fedora-33-container
   variables:
     NAME: fedora-33
 
 x64-fedora-34:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-fedora-34-container
   variables:
     NAME: fedora-34
 
 x64-fedora-rawhide:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-fedora-rawhide-container
   variables:
     NAME: fedora-rawhide
 
 x64-fedora-rawhide-clang:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-fedora-rawhide-container
   variables:
@@ -271,21 +268,21 @@ x64-fedora-rawhide-clang:
     CC: clang
 
 x64-opensuse-leap-152:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-opensuse-leap-152-container
   variables:
     NAME: opensuse-leap-152
 
 x64-opensuse-tumbleweed:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-opensuse-tumbleweed-container
   variables:
     NAME: opensuse-tumbleweed
 
 x64-ubuntu-1804:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-ubuntu-1804-container
   variables:
@@ -293,7 +290,7 @@ x64-ubuntu-1804:
     GOLANG: skip
 
 x64-ubuntu-2004:
-  extends: .native_build_job
+  extends: .base_build_job
   needs:
     - x64-ubuntu-2004-container
   variables:
-- 
2.33.0