ci: Set E2E_TIMEOUT=1m in CI (#5499)

argoproj · Mar 24, 2021 · 95bd1cc · 95bd1cc
1 parent beb0f26
commit 95bd1cc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -112,7 +112,7 @@ jobs:
           KUBECONFIG=~/.kube/config make install PROFILE=$PROFILE E2E_EXECUTOR=${{matrix.containerRuntimeExecutor}} AUTH_MODE=client STATIC_FILES=false DEV_IMAGE=true LOG_LEVEL=info
           KUBECONFIG=~/.kube/config make start   PROFILE=$PROFILE E2E_EXECUTOR=${{matrix.containerRuntimeExecutor}} AUTH_MODE=client STATIC_FILES=false DEV_IMAGE=true LOG_LEVEL=info 2>&1 > /tmp/log/argo-e2e/argo.log &
       - run: make wait
-      - run: make ${{matrix.test}}
+      - run: make ${{matrix.test}} E2E_TIMEOUT=1m
       - name: Upload logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@v1

diff --git a/Makefile b/Makefile
@@ -493,7 +493,7 @@ mysql-cli:
 	kubectl exec -ti `kubectl get pod -l app=mysql -o name|cut -c 5-` -- mysql -u mysql -ppassword argo
 
 start-e2e:
-	$(MAKE) start PROFILE=mysql E2E_EXECUTOR=emissary ALWAYS_OFFLOAD_NODE_STATUS=true AUTH_MODE=client
+	$(MAKE) start PROFILE=mysql E2E_EXECUTOR=$(E2E_EXECUTOR) ALWAYS_OFFLOAD_NODE_STATUS=true AUTH_MODE=client
 
 test-e2e: test-api test-cli test-cron test-executor test-functional
 

diff --git a/test/e2e/fixtures/e2e_suite.go b/test/e2e/fixtures/e2e_suite.go
@@ -25,17 +25,19 @@ import (
 	"github.com/argoproj/argo-workflows/v3/pkg/apis/workflow"
 	"github.com/argoproj/argo-workflows/v3/pkg/client/clientset/versioned"
 	"github.com/argoproj/argo-workflows/v3/pkg/client/clientset/versioned/typed/workflow/v1alpha1"
+	"github.com/argoproj/argo-workflows/v3/util/env"
 	"github.com/argoproj/argo-workflows/v3/util/kubeconfig"
 	"github.com/argoproj/argo-workflows/v3/workflow/common"
 	"github.com/argoproj/argo-workflows/v3/workflow/hydrator"
 )
 
 const (
-	Namespace      = "argo"
-	Label          = workflow.WorkflowFullName + "/test" // mark this workflow as a test
-	defaultTimeout = 30 * time.Second
+	Namespace = "argo"
+	Label     = workflow.WorkflowFullName + "/test" // mark this workflow as a test
 )
 
+var defaultTimeout = env.LookupEnvDurationOr("E2E_TIMEOUT", 30*time.Second)
+
 type E2ESuite struct {
 	suite.Suite
 	Config            *config.Config

diff --git a/test/e2e/fixtures/when.go b/test/e2e/fixtures/when.go
@@ -221,7 +221,7 @@ func (w *When) WaitForWorkflow(options ...interface{}) *When {
 	for _, opt := range options {
 		switch v := opt.(type) {
 		case time.Duration:
-			timeout = v
+			timeout = v - 30*time.Second + defaultTimeout
 		case string:
 			workflowName = v
 		case Condition: