ci: Mark container build jobs as required/optional correctly

Whether a container build job is considered required depends on
whether the corresponding cross-build job exists, and in a few
cases the two got out of sync over time.

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 4f6cd60d515b505f671ff677f0469fca8dcc4165..cd7282a385086221d1c6a0192b88be9cfd01260c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,7 +201,7 @@ armv6l-debian-10-container:
     NAME: debian-10-cross-armv6l
 
 armv7l-debian-10-container:
-  extends: .container_optional_job
+  extends: .container_job
   variables:
     NAME: debian-10-cross-armv7l
 
@@ -246,7 +246,7 @@ armv6l-debian-sid-container:
     NAME: debian-sid-cross-armv6l
 
 armv7l-debian-sid-container:
-  extends: .container_job
+  extends: .container_optional_job
   variables:
     NAME: debian-sid-cross-armv7l
 
@@ -271,7 +271,7 @@ ppc64le-debian-sid-container:
     NAME: debian-sid-cross-ppc64le
 
 s390x-debian-sid-container:
-  extends: .container_optional_job
+  extends: .container_job
   variables:
     NAME: debian-sid-cross-s390x