Minor changes to e2e flow (#1900)

Author: Amulyam24

scripts/ci-e2e.sh

@@ -130,10 +130,7 @@ prerequisites_powervs(){
     export ZONE=${BOSKOS_ZONE:-"osa21"}
     export IBMPOWERVS_REGION=${BOSKOS_REGION:-"osa"}
     export IBMPOWERVS_ZONE=${BOSKOS_ZONE:-"osa21"}
-    export PROVIDER_ID_FORMAT=v2
-    export EXP_CLUSTER_RESOURCE_SET=true
-    export IBMACCOUNT_ID=${IBMACCOUNT_ID:-"7cfbd5381a434af7a09289e795840d4e"}
-    export BASE64_API_KEY=$(tr -d '\n' <<<"$IBMCLOUD_API_KEY" | base64)
+    init_network_powervs
 }
 
 prerequisites_vpc(){
@@ -145,10 +142,6 @@ prerequisites_vpc(){
     export IBMVPC_IMAGE_NAME=${IBMVPC_IMAGE_NAME:-"capibm-vpc-ubuntu-2204-kube-v1-29-3"}
     export IBMVPC_PROFILE=${IBMVPC_PROFILE:-"bx2-4x16"}
     export IBMVPC_SSHKEY_NAME=${IBMVPC_SSHKEY_NAME:-"vpc-cloud-bot-key"}
-    export PROVIDER_ID_FORMAT=v2
-    export EXP_CLUSTER_RESOURCE_SET=true
-    export IBMACCOUNT_ID=${IBMACCOUNT_ID:-"7cfbd5381a434af7a09289e795840d4e"}
-    export BASE64_API_KEY=$(tr -d '\n' <<<"$IBMCLOUD_API_KEY" | base64)
 }
 
 main(){
@@ -184,12 +177,15 @@ main(){
 
     # Set common variables
     export DOCKER_BUILDKIT=1
+    export PROVIDER_ID_FORMAT=v2
+    export EXP_CLUSTER_RESOURCE_SET=true
+    export IBMACCOUNT_ID=${IBMACCOUNT_ID:-"7cfbd5381a434af7a09289e795840d4e"}
+    export BASE64_API_KEY=$(tr -d '\n' <<<"$IBMCLOUD_API_KEY" | base64)
     # Setting controller loglevel to allow debug logs from the VPC/PowerVS client
     export LOGLEVEL=5
 
     if [[ "${E2E_FLAVOR}" == "powervs" || "${E2E_FLAVOR}" == "powervs-md-remediation" ]]; then
         prerequisites_powervs
-        init_network_powervs
     fi
 
     if [[ "${E2E_FLAVOR}" == "vpc" ]]; then