On 26/05/2022 13.07, Daniel P. Berrangé wrote:
This converts the main build and container jobs to use the
base job rules, defining the following new variables
- QEMU_JOB_SKIPPED - jobs that are known to be currently
broken and should not be run. Can still be manually
launched if desired.
- QEMU_JOB_AVOCADO - jobs that run the Avocado integration
test harness.
- QEMU_JOB_PUBLISH - jobs that publish content after the
branch is merged upstream
Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
---
.gitlab-ci.d/base.yml | 22 ++++++++++++++++++++++
.gitlab-ci.d/buildtest-template.yml | 16 ++++------------
.gitlab-ci.d/buildtest.yml | 28 +++++++++++++---------------
.gitlab-ci.d/container-cross.yml | 6 ++----
.gitlab-ci.d/container-template.yml | 1 +
.gitlab-ci.d/crossbuild-template.yml | 3 +++
.gitlab-ci.d/windows.yml | 1 +
docs/devel/ci-jobs.rst.inc | 19 +++++++++++++++++++
8 files changed, 65 insertions(+), 31 deletions(-)
...
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index e9620c3074..ecac3ec50c 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -360,12 +360,11 @@ build-cfi-aarch64:
expire_in: 2 days
paths:
- build
- rules:
+ variables:
# FIXME: This job is often failing, likely due to out-of-memory problems
in
# the constrained containers of the shared runners. Thus this is marked as
- # manual until the situation has been solved.
- - when: manual
- allow_failure: true
+ # skipped until the situation has been solved.
+ QEMU_JOB_SKIPPED: 1
check-cfi-aarch64:
extends: .native_test_job_template
@@ -402,12 +401,11 @@ build-cfi-ppc64-s390x:
expire_in: 2 days
paths:
- build
- rules:
+ variables:
# FIXME: This job is often failing, likely due to out-of-memory problems
in
# the constrained containers of the shared runners. Thus this is marked as
- # manual until the situation has been solved.
- - when: manual
- allow_failure: true
+ # skipped until the situation has been solved.
+ QEMU_JOB_SKIPPED: 1
FYI, this patch broke the build-cfi-aarch64 and build-cfi-ppc64-s390x jobs
since they've now got two "variables:" sections and apparently only the
second one is taken into account...
Thomas