From 5838b08eddd400da8f59689ebe09743bd603ce2e Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Fri, 3 Jul 2020 13:43:08 +0530
Subject: [PATCH] e2e: Move e2e timeout to build.env

Moved e2e test timeout to build.env

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 build.env                  | 1 +
 scripts/travis-functest.sh | 2 +-
 scripts/travis-helmtest.sh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.env b/build.env
index ca3abecae..048a1922f 100644
--- a/build.env
+++ b/build.env
@@ -38,3 +38,4 @@ CHANGE_MINIKUBE_NONE_USER=true
 # - enable CEPH_CSI_RUN_ALL_TESTS when running tests with if it has root
 #   permissions on the host
 #CEPH_CSI_RUN_ALL_TESTS=true
+E2E_TIMEOUT=40m
diff --git a/scripts/travis-functest.sh b/scripts/travis-functest.sh
index 779378bc1..c05a76c19 100755
--- a/scripts/travis-functest.sh
+++ b/scripts/travis-functest.sh
@@ -39,7 +39,7 @@ if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
 fi
 
 # functional tests
-go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e --deploy-timeout=10 -timeout=40m --cephcsi-namespace=cephcsi-e2e-$RANDOM -v -mod=vendor
+go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e --deploy-timeout=10 -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=cephcsi-e2e-$RANDOM -v -mod=vendor
 
 if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
     # delete snapshot CRD
diff --git a/scripts/travis-helmtest.sh b/scripts/travis-helmtest.sh
index 69af8a302..b89065729 100755
--- a/scripts/travis-helmtest.sh
+++ b/scripts/travis-helmtest.sh
@@ -49,7 +49,7 @@ scripts/install-helm.sh up
 # install cephcsi helm charts
 scripts/install-helm.sh install-cephcsi ${NAMESPACE}
 # functional tests
-go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e -mod=vendor --deploy-timeout=10 -timeout=40m --cephcsi-namespace=${NAMESPACE} --deploy-cephfs=false --deploy-rbd=false -v
+go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e -mod=vendor --deploy-timeout=10 -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=${NAMESPACE} --deploy-cephfs=false --deploy-rbd=false -v
 
 #cleanup
 # skip snapshot operation if kube version is less than 1.17.0