Make the timeout a param

knative · Feb 27, 2024 · 3e4928f · 3e4928f
1 parent 2cf8548
commit 3e4928f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -38,6 +38,10 @@ export TEST_RESOURCE="knative"
 export TEST_EVENTING_MONITORING_NAMESPACE="knative-monitoring"
 export KO_FLAGS="${KO_FLAGS:-}"
 export INGRESS_CLASS=${INGRESS_CLASS:-istio.ingress.networking.knative.dev}
+export TIMEOUT_CI=30m
+
+# GKE cluster version
+readonly K8S_CLUSTER_VERSION=1.28
 
 # Boolean used to indicate whether to generate serving YAML based on the latest code in the branch KNATIVE_SERVING_REPO_BRANCH.
 GENERATE_SERVING_YAML=0

diff --git a/test/e2e-eventing-upgrade-tests.sh b/test/e2e-eventing-upgrade-tests.sh
@@ -83,9 +83,9 @@ function test_setup() {
 }
 
 # Skip installing istio as an add-on.
-initialize --cluster-version=1.28 "$@" --skip-istio-addon
+initialize --cluster-version=${K8S_CLUSTER_VERSION} "$@" --skip-istio-addon
 
-TIMEOUT=30m
+TIMEOUT=${TIMEOUT_CI}
 
 header "Running upgrade tests"
 

diff --git a/test/e2e-serving-upgrade-tests.sh b/test/e2e-serving-upgrade-tests.sh
@@ -74,9 +74,9 @@ function create_test_namespace_serving() {
 }
 
 # Skip installing istio as an add-on.
-initialize --cluster-version=1.28 "$@" --skip-istio-addon
+initialize --cluster-version=${K8S_CLUSTER_VERSION} "$@" --skip-istio-addon
 
-TIMEOUT=30m
+TIMEOUT=${TIMEOUT_CI}
 
 header "Running upgrade tests"
 

diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
@@ -34,7 +34,7 @@ function knative_setup() {
 }
 
 # Skip installing istio as an add-on
-initialize --cluster-version=1.28 $@ --skip-istio-addon
+initialize --cluster-version=${K8S_CLUSTER_VERSION} $@ --skip-istio-addon
 
 # If we got this far, the operator installed Knative Serving
 header "Running tests for Knative Operator"

diff --git a/test/e2e-upgrade-tests.sh b/test/e2e-upgrade-tests.sh
@@ -36,9 +36,9 @@ export GO111MODULE=auto
 source "$(dirname "${BASH_SOURCE[0]}")/e2e-common.sh"
 
 # Skip installing istio as an add-on.
-initialize --cluster-version=1.28 "$@" --skip-istio-addon
+initialize --cluster-version=${K8S_CLUSTER_VERSION} "$@" --skip-istio-addon
 
-TIMEOUT=30m
+TIMEOUT=${TIMEOUT_CI}
 
 header "Running upgrade tests"