add PSI and IBM cloud to the script for test

Signed-off-by: anandrkskd <anandrkskd@gmail.com>
redhat-developer · Jul 27, 2021 · a08ab93 · a08ab93
1 parent 5ee1a80
commit a08ab93
Showing 1 changed file with 39 additions and 12 deletions.
diff --git a/scripts/run_script_e2e.sh b/scripts/run_script_e2e.sh
@@ -17,16 +17,20 @@ cp -avf ./odo $GOBIN_TEMP/
 shout "Testing against 4x cluster"
 
 shout "Logging into 4x cluster for some setup (logs hidden)"
+shout $CLUSTER_TYPE
 set +x
-# for PSI
-#oc login -u kubeadmin -p ${OCP4X_KUBEADMIN_PASSWORD} --insecure-skip-tls-verify  ${OCP4X_API_URL}
-# Login to IBM Cloud using service account API Key
-##ibmcloud login --apikey $IBMC_OCP47_APIKEY -a cloud.ibm.com -r eu-de -g "Developer CI and QE"
-
-# Login to cluster in IBM Cloud using cluster API key
-##oc login --token=$IBMC_OCLOGIN_APIKEY --server=$IBMC_OCP47_SERVER
-
-bash /Users/jbossqa/odo/envset.sh
+if $CLUSTER_TYPE == "PSI"
+then
+    #PSI cluster login
+    oc login -u kubeadmin -p ${OCP4X_KUBEADMIN_PASSWORD} --insecure-skip-tls-verify  ${OCP4X_API_URL}
+else
+    # Login to IBM Cloud using service account API Key
+    ##ibmcloud login --apikey $IBMC_OCP47_APIKEY -a cloud.ibm.com -r eu-de -g "Developer CI and QE"
+
+    # Login to cluster in IBM Cloud using cluster API key
+    ##oc login --token=$IBMC_OCLOGIN_APIKEY --server=$IBMC_OCP47_SERVER
+    bash /Users/jbossqa/odo/envset.sh
+fi
 set -x
 
 shout "Doing some presetup"
@@ -57,12 +61,24 @@ done
 
 shout "Logging into 4x cluster as developer (logs hidden)"
 set +x
-##oc login -u developer -p ${OCP4X_DEVELOPER_PASSWORD} --insecure-skip-tls-verify ${OCP4X_API_URL}
+if $CLUSTER_TYPE == "PSI"
+then
+    #PSI cluster login
+    oc login -u developer -p ${OCP4X_DEVELOPER_PASSWORD} --insecure-skip-tls-verify ${OCP4X_API_URL}
+else
+    # Login to IBM Cloud using service account API Key
+    ##ibmcloud login --apikey $IBMC_OCP47_APIKEY -a cloud.ibm.com -r eu-de -g "Developer CI and QE"
+
+    # Login to cluster in IBM Cloud using cluster API key
+    ##oc login --token=$IBMC_OCLOGIN_APIKEY --server=$IBMC_OCP47_SERVER
+    #bash /Users/jbossqa/odo/envset.sh
+fi
+
 set -x
 
 # # Integration tests
 shout "Running integration Tests"
-##make test-operator-hub || error=true
+make test-operator-hub || error=true
 make test-integration || error=true
 make test-integration-devfile || error=true 
 make test-cmd-login-logout || error=true
@@ -80,7 +96,18 @@ fi
 shout "cleaning up post tests"
 shout "Logging into 4x cluster for cleanup (logs hidden)"
 set +x
-##oc login --token=$IBMC_OCLOGIN_APIKEY --server=$IBMC_OCP47_SERVER
+if $CLUSTER_TYPE == "PSI"
+then
+    #PSI cluster login
+    oc login -u kubeadmin -p ${OCP4X_KUBEADMIN_PASSWORD} --insecure-skip-tls-verify  ${OCP4X_API_URL}
+else
+    # Login to IBM Cloud using service account API Key
+    ##ibmcloud login --apikey $IBMC_OCP47_APIKEY -a cloud.ibm.com -r eu-de -g "Developer CI and QE"
+
+    # Login to cluster in IBM Cloud using cluster API key
+    ##oc login --token=$IBMC_OCLOGIN_APIKEY --server=$IBMC_OCP47_SERVER
+    bash /Users/jbossqa/odo/envset.sh
+fi
 set -x
 
 shout "Cleaning up some leftover projects"