Skip to content

Commit 95e6d5c

Browse files
authored
E2E fixes (#1364)
1 parent 014991e commit 95e6d5c

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

scripts/ci-e2e.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ ARCH=$(uname -m)
4141
OS=$(uname -s)
4242
IBMCLOUD_CLI_VERSION=${IBMCLOUD_CLI_VERSION:-"2.16.0"}
4343
E2E_FLAVOR=${E2E_FLAVOR:-}
44-
REGION=${REGION:-"jp-osa"}
4544
capibmadm=$(pwd)/bin/capibmadm
4645

4746
[ "${ARCH}" == "x86_64" ] && ARCH="amd64"
@@ -88,7 +87,7 @@ create_powervs_network_instance(){
8887

8988
ibmcloud config --check-version=false
9089
# Login to IBM Cloud using the API Key
91-
retry "ibmcloud login -a cloud.ibm.com -r ${REGION}"
90+
retry "ibmcloud login -a cloud.ibm.com --no-region"
9291

9392
# Install power-iaas command-line plug-in and target the required service instance
9493
ibmcloud plugin install power-iaas -f
@@ -185,10 +184,6 @@ main(){
185184
# Setting controller loglevel to allow debug logs from the VPC/PowerVS client
186185
export LOGLEVEL=5
187186

188-
if [ -n "${BOSKOS_REGION}" ]; then
189-
REGION=${BOSKOS_REGION}
190-
fi
191-
192187
if [[ "${E2E_FLAVOR}" == "powervs" || "${E2E_FLAVOR}" == "powervs-md-remediation" ]]; then
193188
prerequisites_powervs
194189
init_network_powervs

templates/addons/crs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,4 @@ data:
253253
name: ibm-cloud-config
254254
- name: ibm-secret
255255
secret:
256-
secretName: ibm-cloud-credentia
256+
secretName: ibm-cloud-credential

templates/cluster-template-vpc-load-balancer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ data:
403403
name: ibm-cloud-config
404404
- name: ibm-secret
405405
secret:
406-
secretName: ibm-cloud-credentia
406+
secretName: ibm-cloud-credential
407407
kind: ConfigMap
408408
metadata:
409409
name: cloud-controller-manager-addon

0 commit comments

Comments
 (0)