e2e: Move e2e timeout to build.env

Moved e2e test timeout to build.env

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-07-03 13:43:08 +05:30 committed by mergify[bot]
parent 032fb228dd
commit 5838b08edd
3 changed files with 3 additions and 2 deletions

View File

@ -38,3 +38,4 @@ CHANGE_MINIKUBE_NONE_USER=true
# - enable CEPH_CSI_RUN_ALL_TESTS when running tests with if it has root # - enable CEPH_CSI_RUN_ALL_TESTS when running tests with if it has root
# permissions on the host # permissions on the host
#CEPH_CSI_RUN_ALL_TESTS=true #CEPH_CSI_RUN_ALL_TESTS=true
E2E_TIMEOUT=40m

View File

@ -39,7 +39,7 @@ if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
fi fi
# functional tests # 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 if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
# delete snapshot CRD # delete snapshot CRD

View File

@ -49,7 +49,7 @@ scripts/install-helm.sh up
# install cephcsi helm charts # install cephcsi helm charts
scripts/install-helm.sh install-cephcsi ${NAMESPACE} scripts/install-helm.sh install-cephcsi ${NAMESPACE}
# functional tests # 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 #cleanup
# skip snapshot operation if kube version is less than 1.17.0 # skip snapshot operation if kube version is less than 1.17.0