Do not build suffixed version when not enabled

Signed-off-by: Jakub Scholz <[email protected]>
strimzi · Aug 3, 2022 · 9eb3e54 · 9eb3e54
1 parent d5d7e42
commit 9eb3e54
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.azure/release-pipeline.yaml b/.azure/release-pipeline.yaml
@@ -64,7 +64,7 @@ stages:
     displayName: Publish Containers for ${{ parameters.releaseVersion }}-${{ parameters.releaseSuffix }}
     dependsOn: 
       - release_artifacts
-    condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/heads/release-'))
+    condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/heads/release-'), eq('${{ parameters.useSuffix }}', 'true'))
     jobs:
       - template: 'templates/jobs/push_container.yaml'
         parameters:
@@ -79,7 +79,7 @@ stages:
     dependsOn: 
       - release_artifacts
       - containers_publish_with_suffix
-    condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/heads/release-'))
+    condition: and(in(dependencies.containers_publish_with_suffix.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'), startsWith(variables['build.sourceBranch'], 'refs/heads/release-'))
     jobs:
       - template: 'templates/jobs/push_container.yaml'
         parameters: