From 5a27e0186b236edc135b76537e4befcea2cbf863 Mon Sep 17 00:00:00 2001 From: Prajyot Parab Date: Wed, 8 Feb 2023 08:10:59 +0530 Subject: [PATCH] fix PVS e2e - introduce ginkgo timeout (#1082) Signed-off-by: Prajyot-Parab --- Makefile | 3 ++- scripts/ci-e2e.sh | 5 +++-- test/e2e/config/ibmcloud-e2e-powervs.yaml | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4aade1749..08f074aaa 100644 --- a/Makefile +++ b/Makefile @@ -203,9 +203,10 @@ test: generate fmt vet setup-envtest $(GOTESTSUM) ## Run tests GINKGO_FOCUS ?= Workload cluster creation GINKGO_NODES ?= 3 GINKGO_NOCOLOR ?= false +GINKGO_TIMEOUT ?= 2h E2E_FLAVOR ?= powervs-md-remediation JUNIT_FILE ?= junit.e2e_suite.1.xml -GINKGO_ARGS ?= -v --trace --tags=e2e --focus=$(GINKGO_FOCUS) --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) --output-dir="$(ARTIFACTS)" --junit-report="$(JUNIT_FILE)" +GINKGO_ARGS ?= -v --trace --tags=e2e --timeout=$(GINKGO_TIMEOUT) --focus=$(GINKGO_FOCUS) --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) --output-dir="$(ARTIFACTS)" --junit-report="$(JUNIT_FILE)" ARTIFACTS ?= $(REPO_ROOT)/_artifacts SKIP_CLEANUP ?= false SKIP_CREATE_MGMT_CLUSTER ?= false diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index e9a94cf8e..7d11e3edb 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -36,7 +36,7 @@ mkdir -p "${ARTIFACTS}/logs/" ARCH=$(uname -m) OS=$(uname -s) -IBMCLOUD_CLI_VERSION=${IBMCLOUD_CLI_VERSION:-"2.13.0"} +IBMCLOUD_CLI_VERSION=${IBMCLOUD_CLI_VERSION:-"2.14.0"} PVSADM_VERSION=${PVSADM_VERSION:-"v0.1.9"} E2E_FLAVOR=${E2E_FLAVOR:-} REGION=${REGION:-"jp-osa"} @@ -74,11 +74,12 @@ install_ibmcloud_cli(){ create_powervs_network_instance(){ install_ibmcloud_cli + ibmcloud config --check-version=false # Login to IBM Cloud using the API Key ibmcloud login -a cloud.ibm.com -r ${REGION} # Install power-iaas command-line plug-in and target the required service instance - ibmcloud plugin install power-iaas + ibmcloud plugin install power-iaas -f CRN=$(ibmcloud resource service-instance ${IBMPOWERVS_SERVICE_INSTANCE_ID} --output json | jq -r '.[].crn') ibmcloud pi service-target ${CRN} diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index f832ac442..027d9e1ed 100644 --- a/test/e2e/config/ibmcloud-e2e-powervs.yaml +++ b/test/e2e/config/ibmcloud-e2e-powervs.yaml @@ -60,8 +60,8 @@ variables: intervals: default/wait-controllers: ["3m", "10s"] default/wait-cluster: ["20m", "10s"] - default/wait-control-plane: ["60m", "10s"] - default/wait-worker-nodes: ["60m", "10s"] + default/wait-control-plane: ["40m", "10s"] + default/wait-worker-nodes: ["40m", "10s"] default/wait-delete-cluster: ["20m", "10s"] default/wait-machine-upgrade: ["50m", "10s"] default/wait-machine-remediation: ["30m", "10s"]