06.09.2024 17:09, Daniel P. Berrangé wrote:
This fixes:commit e28112d00703abd136e2411d23931f4f891c9244 Author: Daniel P. Berrangé <berra...@redhat.com> Date: Thu Jun 8 17:40:16 2023 +0100 gitlab: stable staging branches publish containers in a separate tag Due to a copy+paste mistake, that commit included "QEMU_JOB_SKIPPED" in the final rule that was meant to be a 'catch all' for staging branches. As a result stable branches are still splattering dockers from the primary development branch. Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
Reviewed-by: Michael Tokarev <m...@tls.msk.ru> Tested-by: Michael Tokarev <m...@tls.msk.ru> And obviously I'll pick this one up for qemu-stable. I can pick this up through the trivial tree - it seems to be trivial enough :) Thank you very much Daniel! /mjt
--- This should be pulled into all stable branches that have the above mentioned commit content present. .gitlab-ci.d/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index bf3d8efab6..25b88aaa06 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -128,7 +128,7 @@ variables: when: manual# Jobs can run if any jobs they depend on were successful- - if: '$QEMU_JOB_SKIPPED && $CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /staging-[[:digit:]]+\.[[:digit:]]/' + - if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /staging-[[:digit:]]+\.[[:digit:]]/' when: on_success variables: QEMU_CI_CONTAINER_TAG: $CI_COMMIT_REF_SLUG
