File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -110,13 +110,17 @@ jobs:
110110 fi
111111 fi
112112 shell : bash
113+ - name : Set the test timeout - MacOS
114+ if : matrix.os == 'macos-latest'
115+ run : echo "E2E_SH_TEST_TIMEOUT=20m" >> $GITHUB_ENV
113116 - name : Run E2E tests with GHCR
114117 # runs every 6hrs
115118 if : github.event.schedule == '0 */6 * * *'
116119 env :
117120 DAPR_DEFAULT_IMAGE_REGISTRY : ghcr
118121 DAPR_E2E_INIT_SLIM : ${{ contains(matrix.os, 'windows-latest') || contains(matrix.dapr_install_mode, 'slim') }}
119122 CONTAINER_RUNTIME : ${{ env.CONTAINER_RUNTIME }}
123+ E2E_SH_TEST_TIMEOUT : ${{ env.E2E_SH_TEST_TIMEOUT }}
120124 run : |
121125 export TEST_OUTPUT_FILE=$GITHUB_WORKSPACE/test-e2e-standalone.json
122126 echo "TEST_OUTPUT_FILE=$TEST_OUTPUT_FILE" >> $GITHUB_ENV
Original file line number Diff line number Diff line change @@ -70,6 +70,7 @@ export GOOS ?= $(TARGET_OS_LOCAL)
7070export BINARY_EXT ?= $(BINARY_EXT_LOCAL )
7171
7272TEST_OUTPUT_FILE ?= test_output.json
73+ E2E_SH_TEST_TIMEOUT ?= 10m
7374
7475# Use the variable H to add a header (equivalent to =>) to informational output
7576H = $(shell printf "\033[34;1m=>\033[0m")
@@ -175,7 +176,7 @@ e2e-build-run-upgrade: build test-e2e-upgrade
175176# ###############################################################################
176177.PHONY : test-e2e-sh
177178test-e2e-sh : test-deps
178- gotestsum --jsonfile $(TEST_OUTPUT_FILE ) --format standard-verbose -- -count=1 -tags=e2e ./tests/e2e/standalone/...
179+ gotestsum --jsonfile $(TEST_OUTPUT_FILE ) --format standard-verbose -- -timeout $( E2E_SH_TEST_TIMEOUT ) - count=1 -tags=e2e ./tests/e2e/standalone/...
179180
180181# ###############################################################################
181182# Build, E2E Tests for Self-Hosted #
You can’t perform that action at this time.
0 commit comments