From: Andrea Bolognani Date: Thu, 11 Feb 2021 11:55:37 +0000 (+0100) Subject: ci: Mark container build jobs as required/optional correctly X-Git-Tag: v7.1.0-rc1~128 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c56dac1c5482b7692b218899c7af9f792bfc38d6;p=thirdparty%2Flibvirt.git 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 Reviewed-by: Daniel P. Berrangé --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f6cd60d51..cd7282a385 100644 --- 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