From 9d1c91f3c0a3189fdcc2dcc7df91f25809796129 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 8 Jul 2020 17:18:32 +0530 Subject: [PATCH] ci: Pass on the arguments to E2E Pass on the arugments which are sent when calling the scripts to the E2E. Signed-off-by: Madhu Rajanna --- scripts/travis-functest.sh | 4 ++-- scripts/travis-helmtest.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/travis-functest.sh b/scripts/travis-functest.sh index bd9e20920..e06037cbf 100755 --- a/scripts/travis-functest.sh +++ b/scripts/travis-functest.sh @@ -4,7 +4,7 @@ set -e # This script will be used by travis to run functional test # against different kuberentes version export KUBE_VERSION=$1 - +shift # parse the kubernetes version, return the digit passed as argument # v1.17.0 -> kube_version 1 -> 1 # v1.17.0 -> kube_version 2 -> 17 @@ -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="${DEPLOY_TIMEOUT}" -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=cephcsi-e2e-$RANDOM -v -mod=vendor +go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e --deploy-timeout="${DEPLOY_TIMEOUT}" -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 fb743fd6a..9db7b4dc1 100755 --- a/scripts/travis-helmtest.sh +++ b/scripts/travis-helmtest.sh @@ -4,6 +4,7 @@ set -e # This script will be used by travis to run functional test # against different kuberentes version export KUBE_VERSION=$1 +shift # parse the kubernetes version, return the digit passed as argument # v1.17.0 -> kube_version 1 -> 1 # v1.17.0 -> kube_version 2 -> 17 @@ -49,7 +50,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="${DEPLOY_TIMEOUT}" -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=${NAMESPACE} --deploy-cephfs=false --deploy-rbd=false -v +go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e -mod=vendor --deploy-timeout="${DEPLOY_TIMEOUT}" -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