OCPBUGS-45726 [IBMCloud] Require additional service endpoint overrides (

openshift#59857)
ffromani · Dec 16, 2024 · b8f8dd6 · b8f8dd6
1 parent e467067
commit b8f8dd6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/...penshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml b/...penshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml
@@ -2645,6 +2645,8 @@ tests:
     cluster_profile: ibmcloud-qe-2
     env:
       E2E_RUN_TAGS: '@disconnected'
+      SERVICE_ENDPOINT_COSConfig: DEFAULT_ENDPOINT
+      SERVICE_ENDPOINT_GlobalCatalog: DEFAULT_ENDPOINT
       TEST_FILTERS: ~ChkUpgrade&;~NonPreRelease&;~Serial&;~Disruptive&;~ConnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&
     test:
     - chain: openshift-e2e-test-qe
@@ -2656,6 +2658,8 @@ tests:
     env:
       E2E_RUN_TAGS: '@disconnected'
       MIRROR_BIN: oc-mirror
+      SERVICE_ENDPOINT_COSConfig: DEFAULT_ENDPOINT
+      SERVICE_ENDPOINT_GlobalCatalog: DEFAULT_ENDPOINT
       TEST_FILTERS: ~ChkUpgrade&;~NonPreRelease&;~Serial&;~Disruptive&;~ConnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&
     test:
     - chain: openshift-e2e-test-qe-destructive

diff --git a/...openshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-stable.yaml b/...openshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-stable.yaml
@@ -515,6 +515,9 @@ tests:
   cron: 57 17 1 * *
   steps:
     cluster_profile: ibmcloud-qe-2
+    env:
+      SERVICE_ENDPOINT_COSConfig: DEFAULT_ENDPOINT
+      SERVICE_ENDPOINT_GlobalCatalog: DEFAULT_ENDPOINT
     test:
     - chain: cucushift-installer-check-cluster-health
     workflow: cucushift-installer-rehearse-ibmcloud-ipi-disconnected-private

diff --git a/...ft-openshift-tests-private-release-4.18__amd64-nightly-4.18-upgrade-from-stable-4.17.yaml b/...ft-openshift-tests-private-release-4.18__amd64-nightly-4.18-upgrade-from-stable-4.17.yaml
@@ -680,6 +680,8 @@ tests:
   steps:
     cluster_profile: ibmcloud-qe-2
     env:
+      SERVICE_ENDPOINT_COSConfig: DEFAULT_ENDPOINT
+      SERVICE_ENDPOINT_GlobalCatalog: DEFAULT_ENDPOINT
       TEST_FILTERS: ~ConnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&
     test:
     - chain: openshift-upgrade-qe-test-disconnected

diff --git a/...hift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.17.yaml b/...hift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.17.yaml
@@ -80,10 +80,8 @@ tests:
   steps:
     cluster_profile: ibmcloud-qe-2
     env:
-      SLEEP_DURATION: 2m
-    post:
-    - ref: cucushift-installer-wait
-    - chain: cucushift-installer-rehearse-ibmcloud-ipi-disconnected-private-deprovision
+      SERVICE_ENDPOINT_COSConfig: DEFAULT_ENDPOINT
+      SERVICE_ENDPOINT_GlobalCatalog: DEFAULT_ENDPOINT
     test:
     - chain: cucushift-installer-check-cluster-health
     workflow: cucushift-installer-rehearse-ibmcloud-ipi-disconnected-private

diff --git a/...ibmcloud/custom-endpoints/cucushift-installer-check-ibmcloud-custom-endpoints-commands.sh b/...ibmcloud/custom-endpoints/cucushift-installer-check-ibmcloud-custom-endpoints-commands.sh
@@ -29,17 +29,17 @@ function isPreVersion() {
 }
 
 function check_ep_names() {
-    local isPreVersion="$1"
+    local isPreVer="$1"
     local output expString
     output=$(openshift-install explain installconfig.platform.ibmcloud.serviceEndpoints)
-    if [[ "${isPreVersion}" == "True" ]]; then
+    if [[ "${isPreVer}" == "True" ]]; then
         expString='Valid Values: "COS","DNSServices","GlobalCatalog","GlobalSearch","GlobalTagging","HyperProtect","IAM","KeyProtect","ResourceController","ResourceManager","VPC"'
     else
         expString='Valid Values: "CIS","COS","COSConfig","DNSServices","GlobalCatalog","GlobalSearch","GlobalTagging","HyperProtect","IAM","KeyProtect","ResourceController","ResourceManager","VPC"'
     fi
     if ! [[ ${output} == *"${expString}"* ]]; then
         echo "ERROR: Unexpected explain installconfig.platform.ibmcloud.serviceEndpoints: - ${output} "
-        if [[ "${isPreVersion}" == "True" ]]; then
+        if [[ "${isPreVer}" == "True" ]]; then
             echo "OCPBUGS-44943 (openshift explain installconfig.platform.ibmcloud.serviceEndpoints list new ep name of 4.18 in the previous version ) not block the test"
             return 0
         fi
@@ -87,9 +87,9 @@ if [ -f "${SHARED_DIR}/proxy-conf.sh" ] ; then
 fi
 export KUBECONFIG=${SHARED_DIR}/kubeconfig
 
-isPre418="True"
-isPreVersion "4.18" || isPre418="False"
-echo "is Pre 4.18 version: ${isPre418}"
+isPreVer="True"
+isPreVersion "4.17" || isPreVer="False"
+echo "is Pre 4.17 version: ${isPreVer}"
 
 ret=0
 
@@ -108,7 +108,7 @@ else
     echo "WARN: No custom endpoint is defined for COS!"    
 fi
 echo "checking openshift-install explain installconfig.platform.ibmcloud.serviceEndpoints ..." 
-check_ep_names "${isPre418}" || ret=$((ret + $?))
+check_ep_names "${isPreVer}" || ret=$((ret + $?))
 
 echo "checking oc get infrastructure ..."
 check_eps || ret=$((ret + $?))