OCPQE-21276: Add handle for customize api_port

openshift · Apr 30, 2024 · c24302d · c24302d
1 parent 9757d37
commit c24302d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/ci-operator/step-registry/cucushift/upgrade/check/cucushift-upgrade-check-commands.sh b/ci-operator/step-registry/cucushift/upgrade/check/cucushift-upgrade-check-commands.sh
@@ -23,13 +23,17 @@ function preparation_for_test() {
     fi
     #shellcheck source=${SHARED_DIR}/runtime_env
     source "${SHARED_DIR}/runtime_env"
-    upuser1=$(echo "${USERS}" | cut -d ',' -f 30)
-    upuser2=$(echo "${USERS}" | cut -d ',' -f 29)
+    IFS=',' read upuser1 upuser2 _ < <(echo $USERS | cut -d',' -f8-10)
+    apiport="$(yq '.environments.ocp4.api_port' <<< $BUSHSLICER_CONFIG)"
+    version="$(yq '.environments.ocp4.version' <<< $BUSHSLICER_CONFIG)"
+    browser="$(yq '.global.browser' <<< $BUSHSLICER_CONFIG)"
     export BUSHSLICER_CONFIG="
 global:
-  browser: chrome
+  browser: '${browser}'
 environments:
   ocp4:
+    api_port: '${apiport}'
+    version: '${version}'
     static_users_map:
       upuser1: '${upuser1}'
       upuser2: '${upuser2}'

diff --git a/ci-operator/step-registry/cucushift/upgrade/prepare/cucushift-upgrade-prepare-commands.sh b/ci-operator/step-registry/cucushift/upgrade/prepare/cucushift-upgrade-prepare-commands.sh
@@ -23,13 +23,17 @@ function preparation_for_test() {
     fi
     #shellcheck source=${SHARED_DIR}/runtime_env
     source "${SHARED_DIR}/runtime_env"
-    upuser1=$(echo "${USERS}" | cut -d ',' -f 30)
-    upuser2=$(echo "${USERS}" | cut -d ',' -f 29)
+    IFS=',' read upuser1 upuser2 _ < <(echo $USERS | cut -d',' -f8-10)
+    apiport="$(yq '.environments.ocp4.api_port' <<< $BUSHSLICER_CONFIG)"
+    version="$(yq '.environments.ocp4.version' <<< $BUSHSLICER_CONFIG)"
+    browser="$(yq '.global.browser' <<< $BUSHSLICER_CONFIG)"
     export BUSHSLICER_CONFIG="
 global:
-  browser: chrome
+  browser: '${browser}'
 environments:
   ocp4:
+    api_port: '${apiport}'
+    version: '${version}'
     static_users_map:
       upuser1: '${upuser1}'
       upuser2: '${upuser2}'