addressed comments

Author: googlyrahman

dev/ci/periodics/_create_project_and_run_e2e

@@ -32,7 +32,13 @@ EXIT_CODE=0
 dev/tasks/create-test-project
 trap dev/tasks/cleanup-test-resources EXIT
 
-TEST_TIMEOUT=240m dev/tasks/run-e2e || EXIT_CODE=$?
+# If there doesn't exist a TEST_TIMEOUT from the service, keep it 240m
+if [[ -z "${TEST_TIMEOUT:-}" ]]; then
+  TEST_TIMEOUT=240m
+fi
+echo "Using TEST_TIMEOUT=${TEST_TIMEOUT}"
+
+dev/tasks/run-e2e || EXIT_CODE=$?
 
 if [[ -n "${ARTIFACTS:-}" ]]; then
   # Capture our source tree, which includes golden output

dev/ci/periodics/e2e-service-storage

@@ -21,5 +21,7 @@ REPO_ROOT="$(git rev-parse --show-toplevel)"
 cd "${REPO_ROOT}"
 
 export ONLY_TEST_APIGROUPS=storage.cnrm.cloud.google.com
+export SUBTEST_TIMEOUT_E2E=280m
+export TEST_TIMEOUT = 280M
 
 dev/ci/periodics/_create_project_and_run_e2e

tests/e2e/unified_test.go

@@ -611,10 +611,15 @@ func isOperationDone(s string) bool {
 // addTestTimeout will ensure the test fails if not completed before timeout
 func addTestTimeout(ctx context.Context, t *testing.T, timeout time.Duration, name string) context.Context {
 
-	if name == "storageanywherecache" || name == "storageanywherecache-base" || name == "storageanywherecache-full" {
-		// Special timeouts for anywherecache resource when target is real
-		if targetGCP := os.Getenv("E2E_GCP_TARGET"); targetGCP == "real" {
-			timeout = 4 * time.Hour
+	if targetGCP := os.Getenv("E2E_GCP_TARGET"); targetGCP == "real" {
+		// If the target is real, check if SUBTEST_TIMEOUT_E2E is present set
+		// accordingly, or fallback to original timeouts if there's any error.
+
+		if subtestTimeoutE2EStr := os.Getenv("SUBTEST_TIMEOUT_E2E"); subtestTimeoutE2EStr != "" {
+			parsedTimeout, err := time.ParseDuration(subtestTimeoutE2EStr)
+			if err == nil {
+				timeout = parsedTimeout
+			}
 		}
 	}