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 <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-07-08 17:18:32 +05:30 committed by mergify[bot]
parent 63b795d165
commit 9d1c91f3c0
2 changed files with 4 additions and 3 deletions

View File

@ -4,7 +4,7 @@ set -e
# This script will be used by travis to run functional test # This script will be used by travis to run functional test
# against different kuberentes version # against different kuberentes version
export KUBE_VERSION=$1 export KUBE_VERSION=$1
shift
# parse the kubernetes version, return the digit passed as argument # parse the kubernetes version, return the digit passed as argument
# v1.17.0 -> kube_version 1 -> 1 # v1.17.0 -> kube_version 1 -> 1
# v1.17.0 -> kube_version 2 -> 17 # v1.17.0 -> kube_version 2 -> 17
@ -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="${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 if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
# delete snapshot CRD # delete snapshot CRD

View File

@ -4,6 +4,7 @@ set -e
# This script will be used by travis to run functional test # This script will be used by travis to run functional test
# against different kuberentes version # against different kuberentes version
export KUBE_VERSION=$1 export KUBE_VERSION=$1
shift
# parse the kubernetes version, return the digit passed as argument # parse the kubernetes version, return the digit passed as argument
# v1.17.0 -> kube_version 1 -> 1 # v1.17.0 -> kube_version 1 -> 1
# v1.17.0 -> kube_version 2 -> 17 # v1.17.0 -> kube_version 2 -> 17
@ -49,7 +50,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="${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 #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