Do not update in function ct_pull_or_import_postgresql

globally. Some functions needs to have original version.

Create a local NEW_VERSION for each function rather

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

test/test-lib-python.sh

@@ -12,10 +12,7 @@ source "${THISDIR}/test-lib.sh"
 source "${THISDIR}/test-lib-openshift.sh"
 
 function ct_pull_or_import_postgresql() {
-  if [[ "${VERSION}" == *"minimal"* ]]; then
-    VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
-  fi
-  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]]; then
+  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]] || [[ "${VERSION}" == "3.12-minimal" ]]; then
     postgresql_image="quay.io/sclorg/postgresql-12-c8s"
     image_short="postgresql:12"
     image_tag="${image_short}"
@@ -46,8 +43,9 @@ function test_python_imagestream() {
   elif [ "${OS}" == "rhel10" ]; then
     tag="-ubi10"
   fi
+
   # On RHEL10 we have only 3.12-minimal image
-  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]] && [[ "${VERSION}" == "3.12-minimal" ]]; then
+  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]] || [[ "${VERSION}" == "3.12-minimal" ]]; then
     branch="4.2.x"
     postgresql_image="quay.io/sclorg/postgresql-12-c8s|postgresql:12"
     postgresql_version="12"
@@ -78,10 +76,11 @@ function test_python_s2i_app_ex_standalone() {
 }
 
 function test_python_s2i_app_ex() {
+  local NEW_VERSION="${VERSION}"
   if [[ "${VERSION}" == *"minimal"* ]]; then
-    VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
+    NEW_VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
   fi
-  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]]; then
+  if [[ "${NEW_VERSION}" == "3.11" ]] || [[ "${NEW_VERSION}" == "3.12" ]] || [[ "${NEW_VERSION}" == "3.12-minimal" ]]; then
     branch="4.2.x"
   else
     branch="2.2.x"
@@ -101,10 +100,11 @@ function test_python_s2i_templates() {
 django-postgresql.json \
 django-postgresql-persistent.json"
   fi
+  local NEW_VERSION="${VERSION}"
   if [[ "${VERSION}" == *"minimal"* ]]; then
-    VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
+    NEW_VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
   fi
-  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]]; then
+  if [[ "${NEW_VERSION}" == "3.11" ]] || [[ "${NEW_VERSION}" == "3.12" ]]; then
     postgresql_image="quay.io/sclorg/postgresql-12-c8s|postgresql:12"
     postgresql_version="12"
     branch="4.2.x"
@@ -119,7 +119,7 @@ django-postgresql-persistent.json"
                               "https://raw.githubusercontent.com/sclorg/django-ex/${branch}/openshift/templates/${template}" \
                               python \
                               'Welcome to your Django application on OpenShift' \
-                              8080 http 200 "-p SOURCE_REPOSITORY_REF=$branch -p PYTHON_VERSION=${VERSION} -p POSTGRESQL_VERSION=${postgresql_version} -p NAME=python-testing" \
+                              8080 http 200 "-p SOURCE_REPOSITORY_REF=$branch -p PYTHON_VERSION=${NEW_VERSION} -p POSTGRESQL_VERSION=${postgresql_version} -p NAME=python-testing" \
                               "${postgresql_image}"
   done
 }