Prepare upgrade files in packit pipelines in test phase where all env…

…s are set properly (strimzi#10819) Signed-off-by: Jakub Stejskal <[email protected]>
PaulRMellor · Nov 11, 2024 · 692ddc4 · 692ddc4
1 parent c0f4a0f
commit 692ddc4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.azure/scripts/setup_upgrade.sh b/.azure/scripts/setup_upgrade.sh
@@ -2,13 +2,13 @@
 
 set -x
 
-RELEASE=$(cat release.version)
+RELEASE_VERSION=$(cat release.version)
 
 # The commands 1) and 2) are used for change tag in installation files for CO. For each branch only of them match and apply changes
 # 1) The following command is applied only for branches, where release.version contains *SNAPSHOT* (main + others)
 sed -i "s#:latest#:${DOCKER_TAG}#g" packaging/install/cluster-operator/*-Deployment-strimzi-cluster-operator.yaml
 # 2) The following command is applied only for release branches, where release.version contains a final version like 0.29.0
-sed -i "s#:${RELEASE}#:${DOCKER_TAG}#g" packaging/install/cluster-operator/*-Deployment-strimzi-cluster-operator.yaml
+sed -i "s#:${RELEASE_VERSION}#:${DOCKER_TAG}#g" packaging/install/cluster-operator/*-Deployment-strimzi-cluster-operator.yaml
 
 # Change registry and org
 sed -i "s#/opt/${DOCKER_REGISTRY}#/opt#g" packaging/install/cluster-operator/*-Deployment-strimzi-cluster-operator.yaml

diff --git a/systemtest/tmt/plans/main.fmf b/systemtest/tmt/plans/main.fmf
@@ -93,11 +93,6 @@ prepare:
     script: |
       ./.azure/scripts/setup-helm.sh
 
-  - name: Setup upgrade
-    how: shell
-    script: |
-      ./.azure/scripts/setup_upgrade.sh
-
   - name: Install shellcheck
     how: shell
     script: |
@@ -240,4 +235,4 @@ finish:
         - size: ">= 60 GB"
   discover+:
     test:
-      - capacity
+      - capacity
diff --git a/systemtest/tmt/tests/strimzi/test.sh b/systemtest/tmt/tests/strimzi/test.sh
@@ -27,6 +27,9 @@ echo "Using container org '$DOCKER_ORG'"
 echo "Using container tag '$DOCKER_TAG'"
 echo "Using CONNECT_IMAGE_WITH_FILE_SINK_PLUGIN=$CONNECT_IMAGE_WITH_FILE_SINK_PLUGIN"
 
+# Prepare upgrade files
+./.azure/scripts/setup_upgrade.sh
+
 mvn compile -pl config-model-generator -DskipTests -Dmaven.javadoc.skip=true --no-transfer-progress
 mvn verify -pl systemtest -P ${TEST_PROFILE} \
     $([[ "${TEST_GROUPS}" != "" ]] && echo "-Dgroups=${TEST_GROUPS}" || echo "") \