Add e2e timeout to Dockerhub runs and update Makefile default (#1159)

* Fix e2e test timeout

Signed-off-by: Shubham Sharma <[email protected]>

* Revert unwanted change due to formatting

Signed-off-by: Shubham Sharma <[email protected]>

* Override makefile

Signed-off-by: Shubham Sharma <[email protected]>

Signed-off-by: Shubham Sharma <[email protected]>
Co-authored-by: Mukundan Sundararajan <[email protected]>

Author: shubham1172

.github/workflows/self_hosted_e2e.yaml

@@ -132,6 +132,7 @@ jobs:
         env:
           DAPR_E2E_INIT_SLIM: ${{ contains(matrix.os, 'windows-latest') || contains(matrix.dapr_install_mode, 'slim') }}
           CONTAINER_RUNTIME: ${{ env.CONTAINER_RUNTIME }}
+          E2E_SH_TEST_TIMEOUT: ${{ env.E2E_SH_TEST_TIMEOUT }}
         run: |
           export TEST_OUTPUT_FILE=$GITHUB_WORKSPACE/test-e2e-standalone.json
           echo "TEST_OUTPUT_FILE=$TEST_OUTPUT_FILE" >> $GITHUB_ENV

Makefile

@@ -70,7 +70,11 @@ export GOOS ?= $(TARGET_OS_LOCAL)
 export BINARY_EXT ?= $(BINARY_EXT_LOCAL)
 
 TEST_OUTPUT_FILE ?= test_output.json
-E2E_SH_TEST_TIMEOUT ?= 10m
+
+# Set the default timeout for tests to 10 minutes
+ifndef E2E_SH_TEST_TIMEOUT
+  override E2E_SH_TEST_TIMEOUT := 10m
+endif
 
 # Use the variable H to add a header (equivalent to =>) to informational output
 H = $(shell printf "\033[34;1m=>\033[0m")