Testing upgrade... v3

Signed-off-by: Jakub Stejskal <xstejs24@gmail.com>

Author: Frawless

.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

systemtest/tmt/tests/strimzi/test.sh

@@ -3,9 +3,6 @@
 # Move to root folder of strimzi
 cd ../../../../
 
-# Prepare files for upgrade
- ./.azure/scripts/setup_upgrade.sh
-
 # Build connect image
 if [[ ${IP_FAMILY} == "ipv4" || ${IP_FAMILY} == "dual" ]]; then
 	DOCKER_REGISTRY=$(hostname --ip-address | grep -oE '\b([0-9]{1,3}\.){3}[0-9]{1,3}\b' | awk '$1 != "127.0.0.1" { print $1 }' | head -1)
@@ -25,6 +22,9 @@ if [[ ${RELEASE:-False} == True ]]; then
 	export DOCKER_TAG="${PACKIT_TAG_NAME}"
 fi
 
+# Prepare files for upgrade
+ ./.azure/scripts/setup_upgrade.sh
+
 echo "Using container registry '$DOCKER_REGISTRY'"
 echo "Using container org '$DOCKER_ORG'"
 echo "Using container tag '$DOCKER_TAG'"