gitlab: fix logic for changing docker tag on stable branches

This fixes: commit e28112d Author: Daniel P. Berrangé <[email protected]> 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é <[email protected]> Reviewed-by: Michael Tokarev <[email protected]> Tested-by: Michael Tokarev <[email protected]> Message-ID: <[email protected]> Signed-off-by: Thomas Huth <[email protected]> (cherry picked from commit 8d5ab74) Signed-off-by: Michael Tokarev <[email protected]>
cube0x8 · Sep 25, 2024 · 02833b0 · 02833b0
1 parent b95002f
commit 02833b0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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