[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 4/6] gitlab-ci: Convert check-dco/check-patch jobs to the 'rul
From: |
Alex Bennée |
Subject: |
[PATCH v1 4/6] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax |
Date: |
Thu, 27 May 2021 17:03:17 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Per GitLab documentation [*]:
"rules replaces only/except and they can’t be used together
in the same job."
Since the 'rules' syntax is more powerful and we are already using
it, convert the check-dco/check-patch jobs so no job use the 'only/
except' syntax.
[*] https://docs.gitlab.com/ee/ci/yaml/#rules
Inspired-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210525132418.4133235-3-f4bug@amsat.org>
---
.gitlab-ci.yml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c46392b2f..797403477f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -785,12 +785,13 @@ check-patch:
needs:
job: amd64-centos8-container
script: .gitlab-ci.d/check-patch.py
- except:
- variables:
- - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH ==
'master'
variables:
GIT_DEPTH: 1000
- allow_failure: true
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH ==
"master"'
+ when: never
+ - when: on_success
+ allow_failure: true
check-dco:
stage: build
@@ -798,11 +799,12 @@ check-dco:
needs:
job: amd64-centos8-container
script: .gitlab-ci.d/check-dco.py
- except:
- variables:
- - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH ==
'master'
variables:
GIT_DEPTH: 1000
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH ==
"master"'
+ when: never
+ - when: on_success
build-libvhost-user:
stage: build
--
2.20.1
- [PATCH v1 0/6] testing/next queue (signal, meson, acceptance tags), Alex Bennée, 2021/05/27
- [PATCH v1 2/6] meson.build: fix cosmetics of compiler display, Alex Bennée, 2021/05/27
- [PATCH v1 3/6] tests/tcg/configure.sh: tweak quoting of target_compiler, Alex Bennée, 2021/05/27
- [PATCH v1 1/6] tests/tcg: add a multiarch signals test to stress test signal delivery, Alex Bennée, 2021/05/27
- [PATCH v1 4/6] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax,
Alex Bennée <=
- [PATCH v1 5/6] tests/acceptance: tweak the tcg/kvm tests for virt, Alex Bennée, 2021/05/27
- [PATCH v1 6/6] tests/acceptance: tag various arm tests as TCG only, Alex Bennée, 2021/05/27