From: Philippe Mathieu-Daudé Date: Tue, 27 Jul 2021 14:24:29 +0000 (+0200) Subject: gitlab-ci: Fix 'when:' condition in acceptance_test_job_template X-Git-Tag: v6.1.0-rc2~14^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3a4e41da25e55b327cc8092f97a6cf02d0b5227;p=thirdparty%2Fqemu.git gitlab-ci: Fix 'when:' condition in acceptance_test_job_template Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'. Fixes: f56bf4caf71 ("gitlab: Run Avocado tests manually (except mainstream CI)") Reported-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Message-Id: <20210727142431.1672530-3-philmd@redhat.com> Signed-off-by: Thomas Huth --- diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 3e3e19d96bd..fcbcc4e627a 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -73,9 +73,9 @@ # in its namespace setting or via git-push option, see documentation # in /.gitlab-ci.yml of this repository). - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: always + when: on_success - if: '$QEMU_CI_AVOCADO_TESTING' - when: always + when: on_success # Otherwise, set to manual (the jobs are created but not run). - when: manual allow_failure: true