From: Daniel P. Berrangé <[email protected]> When extending the container template to allow scheduled pipelines in upstream context, we must ensure that all the existing rules defined by .base_job_template are preserved.
Fortunately since the new rule for scheduled pipelines can come at the head of all other rules, not in the middle, we can just the obscure '!reference' syntax to pull in all the pre-existing rules as a single block. This fixes * stable branches using the wrong tag name in container images * pushes to forks unconditionally running container builds Fixes: 8bec7b9874235e60f14172618121c60fdbd39302 Signed-off-by: Daniel P. Berrangé <[email protected]> Tested-by: Michael Tokarev <[email protected]> Fixes: 8bec7b987423 ("gitlab: add a weekly container building job") Message-ID: <[email protected]> Signed-off-by: Thomas Huth <[email protected]> (cherry picked from commit 815567b4ea35176a8f92c5f25bfb335c1cac274e) Signed-off-by: Michael Tokarev <[email protected]> diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 82c1b69e8d..8c7311cca5 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -21,6 +21,5 @@ - docker logout rules: # because we want to enable this for scheduled runs we also have to replicate the normal rules - - if: '$CI_PIPELINE_SOURCE == "schedule"' - - if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /^staging/' - - if: '$QEMU_CI && $CI_PROJECT_NAMESPACE != $QEMU_CI_UPSTREAM' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM' + - !reference [.base_job_template, rules] -- 2.47.3
