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é <berra...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- .gitlab-ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b89143f81f..83e077d095c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -786,12 +786,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 @@ -799,11 +800,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.26.3
