fix: Add Ginkgo "timeout" param & Remove invalid azcopy link (#287)

Azure · Jan 14, 2025 · 9178eb2 · 9178eb2
1 parent 11820a7
commit 9178eb2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/hack/tools/Makefile b/hack/tools/Makefile
@@ -88,9 +88,7 @@ kubectl:
 
 azcopy:
 	curl -sSL https://aka.ms/downloadazcopy-v10-linux | tar -vxz -C $(LOCALBIN) --strip=1
-	mv $(LOCALBIN)/azcopy $(LOCALBIN)/azcopy-preview
-	curl -sSL https://aka.ms/downloadazcopylinux64 | tar -vxz -C /tmp
-	/tmp/install.sh
+	cp $(LOCALBIN)/azcopy $(LOCALBIN)/azcopy-preview
 
 .PHONY: reload
 reload: clean install

diff --git a/test/e2e/cluster.sh b/test/e2e/cluster.sh
@@ -219,6 +219,7 @@ docker run --rm \
 -e GINKGO_FAIL_FAST="${GINKGO_FAIL_FAST}" \
 -e GINKGO_FOCUS="${GINKGO_FOCUS}" \
 -e GINKGO_SKIP="${GINKGO_SKIP}" \
+-e GINKGO_TIMEOUT="${GINKGO_TIMEOUT}" \
 -e API_PROFILE="${API_PROFILE}" \
 -e CUSTOM_CLOUD_NAME="${ENVIRONMENT_NAME}" \
 -e IDENTITY_SYSTEM="${IDENTITY_SYSTEM}" \
@@ -363,6 +364,7 @@ if [ "${ROTATE_CERTS}" = "true" ]; then
     -e GINKGO_FAIL_FAST="${GINKGO_FAIL_FAST}" \
     -e GINKGO_SKIP="${SKIP_AFTER_ROTATE_CERTS}" \
     -e GINKGO_FOCUS="${GINKGO_FOCUS}" \
+    -e GINKGO_TIMEOUT="${GINKGO_TIMEOUT}" \
     -e TEST_PVC="${TEST_PVC}" \
     -e CLEAN_PVC="${CLEAN_PVC}" \
     -e SKIP_TEST=false \
@@ -449,6 +451,7 @@ if [ -n "$ADD_NODE_POOL_INPUT" ]; then
     -e GINKGO_FAIL_FAST="${GINKGO_FAIL_FAST}" \
     -e GINKGO_SKIP="${SKIP_AFTER_SCALE_DOWN}" \
     -e GINKGO_FOCUS="${GINKGO_FOCUS}" \
+    -e GINKGO_TIMEOUT="${GINKGO_TIMEOUT}" \
     -e TEST_PVC="${TEST_PVC}" \
     -e CLEAN_PVC="${CLEAN_PVC}" \
     -e SKIP_TEST=${SKIP_TESTS_AFTER_ADD_POOL} \
@@ -534,6 +537,7 @@ if [ "${SCALE_CLUSTER}" = "true" ]; then
     -e GINKGO_FAIL_FAST="${GINKGO_FAIL_FAST}" \
     -e GINKGO_SKIP="${SKIP_AFTER_SCALE_DOWN}" \
     -e GINKGO_FOCUS="${GINKGO_FOCUS}" \
+    -e GINKGO_TIMEOUT="${GINKGO_TIMEOUT}" \
     -e TEST_PVC="${TEST_PVC}" \
     -e CLEAN_PVC="${CLEAN_PVC}" \
     -e SKIP_TEST=${SKIP_TESTS_AFTER_SCALE_DOWN} \
@@ -629,6 +633,7 @@ if [ "${UPGRADE_CLUSTER}" = "true" ]; then
       -e GINKGO_FAIL_FAST="${GINKGO_FAIL_FAST}" \
       -e GINKGO_SKIP="${SKIP_AFTER_UPGRADE}" \
       -e GINKGO_FOCUS="${GINKGO_FOCUS}" \
+      -e GINKGO_TIMEOUT="${GINKGO_TIMEOUT}" \
       -e TEST_PVC="${TEST_PVC}" \
       -e CLEAN_PVC="${CLEAN_PVC}" \
       -e SKIP_TEST=${SKIP_TESTS_AFTER_UPGRADE} \
@@ -713,6 +718,7 @@ if [ "${SCALE_CLUSTER}" = "true" ]; then
     -e GINKGO_FAIL_FAST="${GINKGO_FAIL_FAST}" \
     -e GINKGO_SKIP="${SKIP_AFTER_SCALE_UP}" \
     -e GINKGO_FOCUS="${GINKGO_FOCUS}" \
+    -e GINKGO_TIMEOUT="${GINKGO_TIMEOUT}" \
     -e TEST_PVC="${TEST_PVC}" \
     -e CLEAN_PVC="${CLEAN_PVC}" \
     -e SKIP_TEST=${SKIP_TESTS_AFTER_SCALE_UP} \

diff --git a/test/e2e/config/config.go b/test/e2e/config/config.go
@@ -53,6 +53,7 @@ type Config struct {
 	UseDeployCommand                   bool   `envconfig:"USE_DEPLOY_COMMAND" default:"false"`
 	GinkgoFocus                        string `envconfig:"GINKGO_FOCUS" default:""`
 	GinkgoSkip                         string `envconfig:"GINKGO_SKIP" default:""`
+	GinkgoTimeout                      string `envconfig:"GINKGO_TIMEOUT" default:""`
 	GinkgoFailFast                     bool   `envconfig:"GINKGO_FAIL_FAST" default:"false"`
 	GinkgoParallel                     bool   `envconfig:"GINKGO_PARALLEL" default:"false"`
 	GinkgoJUnitReportPath              string `envconfig:"GINKGO_JUNIT_PATH" default:""`

diff --git a/test/e2e/runner/ginkgo.go b/test/e2e/runner/ginkgo.go
@@ -63,6 +63,10 @@ func (g *Ginkgo) Run() error {
 		args = append(args, "-skip")
 		args = append(args, g.Config.GinkgoSkip)
 	}
+	if g.Config.GinkgoTimeout != "" {
+		args = append(args, "-timeout")
+		args = append(args, g.Config.GinkgoTimeout)
+	}
 	args = append(args, testFile)
 	var cmd = exec.Command("ginkgo", args...)