[libvirt PATCH 2/2] ci: remove non-existant 'containers: false' key usage

The 'containers: false' key was originally intend to be a way to tell libvirt-ci to generate the dockerfiles, but not generate any container jobs. This concept was never implemented. Instead we should be using the 'allow-failure: true' key to allow the container job to fail. The builds job can still be disabled by default. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- ci/gitlab/builds.yml | 60 ++++++++++++++++++++-------------------- ci/gitlab/containers.yml | 30 ++++++++++---------- ci/manifest.yml | 30 ++++++++++---------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 67b9fda454..09e6816fd9 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -401,7 +401,7 @@ aarch64-debian-11-prebuilt-env: needs: - job: aarch64-debian-11-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: aarch64 JOB_OPTIONAL: 1 @@ -410,7 +410,7 @@ aarch64-debian-11-prebuilt-env: aarch64-debian-11-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: aarch64 IMAGE: docker.io/library/debian:11-slim @@ -423,7 +423,7 @@ armv6l-debian-11-prebuilt-env: needs: - job: armv6l-debian-11-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: armv6l JOB_OPTIONAL: 1 @@ -432,7 +432,7 @@ armv6l-debian-11-prebuilt-env: armv6l-debian-11-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: armv6l IMAGE: docker.io/library/debian:11-slim @@ -465,7 +465,7 @@ i686-debian-11-prebuilt-env: needs: - job: i686-debian-11-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: i686 JOB_OPTIONAL: 1 @@ -474,7 +474,7 @@ i686-debian-11-prebuilt-env: i686-debian-11-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: i686 IMAGE: docker.io/library/debian:11-slim @@ -487,7 +487,7 @@ mips64el-debian-11-prebuilt-env: needs: - job: mips64el-debian-11-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: mips64el JOB_OPTIONAL: 1 @@ -496,7 +496,7 @@ mips64el-debian-11-prebuilt-env: mips64el-debian-11-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: mips64el IMAGE: docker.io/library/debian:11-slim @@ -509,7 +509,7 @@ mipsel-debian-11-prebuilt-env: needs: - job: mipsel-debian-11-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: mipsel JOB_OPTIONAL: 1 @@ -518,7 +518,7 @@ mipsel-debian-11-prebuilt-env: mipsel-debian-11-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: mipsel IMAGE: docker.io/library/debian:11-slim @@ -531,7 +531,7 @@ ppc64le-debian-11-prebuilt-env: needs: - job: ppc64le-debian-11-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: ppc64le JOB_OPTIONAL: 1 @@ -540,7 +540,7 @@ ppc64le-debian-11-prebuilt-env: ppc64le-debian-11-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: ppc64le IMAGE: docker.io/library/debian:11-slim @@ -553,7 +553,7 @@ s390x-debian-11-prebuilt-env: needs: - job: s390x-debian-11-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: s390x JOB_OPTIONAL: 1 @@ -562,7 +562,7 @@ s390x-debian-11-prebuilt-env: s390x-debian-11-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: s390x IMAGE: docker.io/library/debian:11-slim @@ -575,7 +575,7 @@ aarch64-debian-sid-prebuilt-env: needs: - job: aarch64-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: aarch64 JOB_OPTIONAL: 1 @@ -584,7 +584,7 @@ aarch64-debian-sid-prebuilt-env: aarch64-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: aarch64 IMAGE: docker.io/library/debian:sid-slim @@ -597,7 +597,7 @@ armv6l-debian-sid-prebuilt-env: needs: - job: armv6l-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: armv6l JOB_OPTIONAL: 1 @@ -606,7 +606,7 @@ armv6l-debian-sid-prebuilt-env: armv6l-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: armv6l IMAGE: docker.io/library/debian:sid-slim @@ -619,7 +619,7 @@ armv7l-debian-sid-prebuilt-env: needs: - job: armv7l-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: armv7l JOB_OPTIONAL: 1 @@ -628,7 +628,7 @@ armv7l-debian-sid-prebuilt-env: armv7l-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: armv7l IMAGE: docker.io/library/debian:sid-slim @@ -641,7 +641,7 @@ i686-debian-sid-prebuilt-env: needs: - job: i686-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: i686 JOB_OPTIONAL: 1 @@ -650,7 +650,7 @@ i686-debian-sid-prebuilt-env: i686-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: i686 IMAGE: docker.io/library/debian:sid-slim @@ -663,7 +663,7 @@ mips64el-debian-sid-prebuilt-env: needs: - job: mips64el-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: mips64el JOB_OPTIONAL: 1 @@ -672,7 +672,7 @@ mips64el-debian-sid-prebuilt-env: mips64el-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: mips64el IMAGE: docker.io/library/debian:sid-slim @@ -685,7 +685,7 @@ mipsel-debian-sid-prebuilt-env: needs: - job: mipsel-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: mipsel JOB_OPTIONAL: 1 @@ -694,7 +694,7 @@ mipsel-debian-sid-prebuilt-env: mipsel-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: mipsel IMAGE: docker.io/library/debian:sid-slim @@ -707,7 +707,7 @@ ppc64le-debian-sid-prebuilt-env: needs: - job: ppc64le-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: ppc64le JOB_OPTIONAL: 1 @@ -716,7 +716,7 @@ ppc64le-debian-sid-prebuilt-env: ppc64le-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: ppc64le IMAGE: docker.io/library/debian:sid-slim @@ -729,7 +729,7 @@ s390x-debian-sid-prebuilt-env: needs: - job: s390x-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: s390x JOB_OPTIONAL: 1 @@ -738,7 +738,7 @@ s390x-debian-sid-prebuilt-env: s390x-debian-sid-local-env: extends: .cross_build_job_local_env needs: [] - allow_failure: false + allow_failure: true variables: CROSS: s390x IMAGE: docker.io/library/debian:sid-slim diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index dcc42b3f8b..cf374b04e2 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -110,7 +110,7 @@ x86_64-ubuntu-2204-container: aarch64-debian-11-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-11-cross-aarch64 @@ -118,7 +118,7 @@ aarch64-debian-11-container: armv6l-debian-11-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-11-cross-armv6l @@ -133,7 +133,7 @@ armv7l-debian-11-container: i686-debian-11-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-11-cross-i686 @@ -141,7 +141,7 @@ i686-debian-11-container: mips64el-debian-11-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-11-cross-mips64el @@ -149,7 +149,7 @@ mips64el-debian-11-container: mipsel-debian-11-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-11-cross-mipsel @@ -157,7 +157,7 @@ mipsel-debian-11-container: ppc64le-debian-11-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-11-cross-ppc64le @@ -165,7 +165,7 @@ ppc64le-debian-11-container: s390x-debian-11-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-11-cross-s390x @@ -173,7 +173,7 @@ s390x-debian-11-container: aarch64-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-aarch64 @@ -181,7 +181,7 @@ aarch64-debian-sid-container: armv6l-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-armv6l @@ -189,7 +189,7 @@ armv6l-debian-sid-container: armv7l-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-armv7l @@ -197,7 +197,7 @@ armv7l-debian-sid-container: i686-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-i686 @@ -205,7 +205,7 @@ i686-debian-sid-container: mips64el-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-mips64el @@ -213,7 +213,7 @@ mips64el-debian-sid-container: mipsel-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-mipsel @@ -221,7 +221,7 @@ mipsel-debian-sid-container: ppc64le-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-ppc64le @@ -229,7 +229,7 @@ ppc64le-debian-sid-container: s390x-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-s390x diff --git a/ci/manifest.yml b/ci/manifest.yml index 92cf80315e..e469438328 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -51,33 +51,33 @@ targets: suffix: -clang - arch: aarch64 - containers: false + allow-failure: true builds: false - arch: armv6l - containers: false + allow-failure: true builds: false - arch: armv7l - arch: i686 - containers: false + allow-failure: true builds: false - arch: mips64el - containers: false + allow-failure: true builds: false - arch: mipsel - containers: false + allow-failure: true builds: false - arch: ppc64le - containers: false + allow-failure: true builds: false - arch: s390x - containers: false + allow-failure: true builds: false debian-sid: @@ -86,35 +86,35 @@ targets: allow-failure: true - arch: aarch64 - containers: false + allow-failure: true builds: false - arch: armv6l - containers: false + allow-failure: true builds: false - arch: armv7l - containers: false + allow-failure: true builds: false - arch: i686 - containers: false + allow-failure: true builds: false - arch: mips64el - containers: false + allow-failure: true builds: false - arch: mipsel - containers: false + allow-failure: true builds: false - arch: ppc64le - containers: false + allow-failure: true builds: false - arch: s390x - containers: false + allow-failure: true builds: false fedora-36: -- 2.39.0