From ef02f8951d12e2c2c0c5ba862798d129b0c3fb44 Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Fri, 29 Oct 2021 15:56:34 -0700 Subject: [PATCH 1/4] Update default GINGKO_NODES to 5 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cfb6bf7ecf7..b1bf4f29275 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ PULL_POLICY ?= Always # Allow overriding the e2e configurations GINKGO_FOCUS ?= Workload cluster creation GINKGO_SKIP ?= Creating a GPU-enabled cluster -GINKGO_NODES ?= 3 +GINKGO_NODES ?= 5 GINKGO_NOCOLOR ?= false GINKGO_ARGS ?= ARTIFACTS ?= $(ROOT_DIR)/_artifacts From d1d5e583ae2f409cc844fc4ed8e1e596c72c756d Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Fri, 29 Oct 2021 16:13:31 -0700 Subject: [PATCH 2/4] Update ci-e2e.sh --- scripts/ci-e2e.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index 95dc20b8d99..7cadd06a2ed 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -65,7 +65,7 @@ fi defaultTag=$(date -u '+%Y%m%d%H%M%S') export TAG="${defaultTag:-dev}" -export GINKGO_NODES=3 +export GINKGO_NODES=5 export AZURE_LOCATION="${AZURE_LOCATION:-$(get_random_region)}" export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_D2s_v3"}" From 8769bd602bedcbe499b62a00fa1eec69b582fe2f Mon Sep 17 00:00:00 2001 From: shysank Date: Mon, 8 Nov 2021 13:24:36 -0800 Subject: [PATCH 3/4] increase azurecluster and azuremachine concurrency for e2e test --- config/manager/manager.yaml | 2 ++ test/e2e/config/azure-dev.yaml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index dd104cb9fe1..a5524de79ba 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -23,6 +23,8 @@ spec: - args: - --leader-elect - "--metrics-bind-addr=localhost:8080" + - "--azurecluster-concurrency=10" + - "--azuremachine-concurrency=10" - "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},AKS=${EXP_AKS:=false}" - "--v=0" image: controller:latest diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml index b1a01c85f31..45bf6ed9975 100644 --- a/test/e2e/config/azure-dev.yaml +++ b/test/e2e/config/azure-dev.yaml @@ -136,6 +136,10 @@ providers: replacements: - old: "--v=0" new: "--v=2" + - old: "--azurecluster-concurrency=10" + new: "--azurecluster-concurrency=20" + - old: "--azuremachine-concurrency=10" + new: "--azuremachine-concurrency=20" variables: KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.22.1}" From 2ff77ac4d8d0f424138aa8eabf1ac6b2e81b85e0 Mon Sep 17 00:00:00 2001 From: shysank Date: Tue, 9 Nov 2021 09:10:15 -0800 Subject: [PATCH 4/4] add debug flag for ginkgo e2e test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b1bf4f29275..be2c451bde0 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,7 @@ test-cover: envs-test $(KUBECTL) $(KUBE_APISERVER) $(ETCD) ## Run tests with cod .PHONY: test-e2e-run test-e2e-run: generate-e2e-templates $(ENVSUBST) $(KUBECTL) $(GINKGO) ## Run e2e tests $(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \ - $(GINKGO) -v -trace -tags=e2e -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" -nodes=$(GINKGO_NODES) --noColor=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \ + $(GINKGO) -v -trace -tags=e2e -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" -debug -stream -nodes=$(GINKGO_NODES) --noColor=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \ -e2e.artifacts-folder="$(ARTIFACTS)" \ -e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \ -e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) $(E2E_ARGS)