This refreshes the containers bringing in new behaviour when
builds/containers are disabled.
Instead of deleting the job entirely, the job still exists
but is set to be a manual job. It won't affect the pipeline
result, but can be triggered by the developer if they wish
to test a specific scenario.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
ci/gitlab/build-templates.yml | 17 ++-
ci/gitlab/builds.yml | 216 ++++++++++++++++++++++++++++++
ci/gitlab/container-templates.yml | 3 +
3 files changed, 235 insertions(+), 1 deletion(-)
diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml
index 446822d5d1..20d22914c2 100644
--- a/ci/gitlab/build-templates.yml
+++ b/ci/gitlab/build-templates.yml
@@ -8,11 +8,21 @@
.gitlab_native_build_job:
image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
stage: builds
+ rules:
+ - if: '$LIBVIRT_JOB_OPTIONAL'
+ when: manual
+ allow_failure: true
+ - when: on_success
.gitlab_cross_build_job:
image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest
stage: builds
+ rules:
+ - if: '$LIBVIRT_JOB_OPTIONAL'
+ when: manual
+ allow_failure: true
+ - when: on_success
.cirrus_build_job:
@@ -42,4 +52,9 @@
- cat ci/cirrus/$NAME.yml
- cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml
rules:
- - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN"
+ - if: "$CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null"
+ when: never
+ - if: '$LIBVIRT_JOB_OPTIONAL'
+ when: manual
+ allow_failure: true
+ - when: on_success
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index d136b0776e..e2efeb4f73 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -235,6 +235,18 @@ x86_64-ubuntu-2204-clang:
# Cross build jobs
+aarch64-debian-10:
+ extends: .cross_build_job
+ needs:
+ - job: aarch64-debian-10-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: aarch64
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-10
+
+
armv6l-debian-10:
extends: .cross_build_job
needs:
@@ -246,6 +258,30 @@ armv6l-debian-10:
NAME: debian-10
+armv7l-debian-10:
+ extends: .cross_build_job
+ needs:
+ - job: armv7l-debian-10-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: armv7l
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-10
+
+
+i686-debian-10:
+ extends: .cross_build_job
+ needs:
+ - job: i686-debian-10-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: i686
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-10
+
+
mips-debian-10:
extends: .cross_build_job
needs:
@@ -257,6 +293,18 @@ mips-debian-10:
NAME: debian-10
+mips64el-debian-10:
+ extends: .cross_build_job
+ needs:
+ - job: mips64el-debian-10-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: mips64el
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-10
+
+
mipsel-debian-10:
extends: .cross_build_job
needs:
@@ -268,6 +316,54 @@ mipsel-debian-10:
NAME: debian-10
+ppc64le-debian-10:
+ extends: .cross_build_job
+ needs:
+ - job: ppc64le-debian-10-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: ppc64le
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-10
+
+
+s390x-debian-10:
+ extends: .cross_build_job
+ needs:
+ - job: s390x-debian-10-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: s390x
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-10
+
+
+aarch64-debian-11:
+ extends: .cross_build_job
+ needs:
+ - job: aarch64-debian-11-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: aarch64
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-11
+
+
+armv6l-debian-11:
+ extends: .cross_build_job
+ needs:
+ - job: armv6l-debian-11-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: armv6l
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-11
+
+
armv7l-debian-11:
extends: .cross_build_job
needs:
@@ -279,6 +375,18 @@ armv7l-debian-11:
NAME: debian-11
+i686-debian-11:
+ extends: .cross_build_job
+ needs:
+ - job: i686-debian-11-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: i686
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-11
+
+
mips64el-debian-11:
extends: .cross_build_job
needs:
@@ -290,6 +398,18 @@ mips64el-debian-11:
NAME: debian-11
+mipsel-debian-11:
+ extends: .cross_build_job
+ needs:
+ - job: mipsel-debian-11-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: mipsel
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-11
+
+
ppc64le-debian-11:
extends: .cross_build_job
needs:
@@ -301,6 +421,18 @@ ppc64le-debian-11:
NAME: debian-11
+s390x-debian-11:
+ extends: .cross_build_job
+ needs:
+ - job: s390x-debian-11-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: s390x
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-11
+
+
aarch64-debian-sid:
extends: .cross_build_job
needs:
@@ -312,6 +444,30 @@ aarch64-debian-sid:
NAME: debian-sid
+armv6l-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - job: armv6l-debian-sid-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: armv6l
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-sid
+
+
+armv7l-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - job: armv7l-debian-sid-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: armv7l
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-sid
+
+
i686-debian-sid:
extends: .cross_build_job
needs:
@@ -323,6 +479,42 @@ i686-debian-sid:
NAME: debian-sid
+mips64el-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - job: mips64el-debian-sid-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: mips64el
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-sid
+
+
+mipsel-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - job: mipsel-debian-sid-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: mipsel
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-sid
+
+
+ppc64le-debian-sid:
+ extends: .cross_build_job
+ needs:
+ - job: ppc64le-debian-sid-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: ppc64le
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: debian-sid
+
+
s390x-debian-sid:
extends: .cross_build_job
needs:
@@ -334,6 +526,18 @@ s390x-debian-sid:
NAME: debian-sid
+mingw32-fedora-36:
+ extends: .cross_build_job
+ needs:
+ - job: mingw32-fedora-36-container
+ optional: true
+ allow_failure: false
+ variables:
+ CROSS: mingw32
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: fedora-36
+
+
mingw64-fedora-36:
extends: .cross_build_job
needs:
@@ -356,6 +560,18 @@ mingw32-fedora-rawhide:
NAME: fedora-rawhide
+mingw64-fedora-rawhide:
+ extends: .cross_build_job
+ needs:
+ - job: mingw64-fedora-rawhide-container
+ optional: true
+ allow_failure: true
+ variables:
+ CROSS: mingw64
+ LIBVIRT_JOB_OPTIONAL: 1
+ NAME: fedora-rawhide
+
+
# Native cirrus build jobs
x86_64-freebsd-12:
diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templates.yml
index 4cd28af8a9..c71d03c759 100644
--- a/ci/gitlab/container-templates.yml
+++ b/ci/gitlab/container-templates.yml
@@ -49,4 +49,7 @@
when: on_success
- if: '$CI_PROJECT_NAMESPACE == "libvirt"'
when: never
+ - if: '$LIBVIRT_JOB_OPTIONAL'
+ when: manual
+ allow_failure: true
- when: on_success
--
2.36.1