mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-17 20:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: remove check for snapshot controller installation and cleanup

Browse Source 
At present, the check is performed to validate the version of kube
is v1.17 and this commit remove the same.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2022-08-01 21:41:15 +05:30 committed by mergify[bot]
parent 5aabd4e1d2
commit c9773db3f3
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/travis-functest.sh
View File

@ -27,21 +27,12 @@ sudo scripts/minikube.sh create-block-pool
# pull docker images to speed up e2e # pull docker images to speed up e2e
sudo scripts/minikube.sh cephcsi sudo scripts/minikube.sh cephcsi
sudo scripts/minikube.sh k8s-sidecar sudo scripts/minikube.sh k8s-sidecar
KUBE_MAJOR=$(kube_version 1) # install snapshot controller and create snapshot CRD
KUBE_MINOR=$(kube_version 2) scripts/install-snapshot.sh install
# skip snapshot operation if kube version is less than 1.17.0
if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
# delete snapshot CRD created by ceph-csi in rook
scripts/install-snapshot.sh delete-crd
# install snapshot controller
scripts/install-snapshot.sh install
fi
# functional tests # functional tests
make run-e2e E2E_ARGS="${*}" make run-e2e E2E_ARGS="${*}"
if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then # cleanup
# delete snapshot CRD scripts/install-snapshot.sh cleanup
scripts/install-snapshot.sh cleanup
fi
sudo scripts/minikube.sh clean sudo scripts/minikube.sh clean

19
scripts/travis-helmtest.sh
View File

@ -35,15 +35,8 @@ sudo scripts/minikube.sh k8s-sidecar
NAMESPACE=cephcsi-e2e-$RANDOM NAMESPACE=cephcsi-e2e-$RANDOM
# create ns for e2e # create ns for e2e
kubectl create ns ${NAMESPACE} kubectl create ns ${NAMESPACE}
KUBE_MAJOR=$(kube_version 1) # install snapshot controller and create snapshot CRD
KUBE_MINOR=$(kube_version 2) scripts/install-snapshot.sh install
# skip snapshot operation if kube version is less than 1.17.0
if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
# delete snapshot CRD created by ceph-csi in rook
scripts/install-snapshot.sh delete-crd
# install snapshot controller
scripts/install-snapshot.sh install
fi
# set up helm # set up helm
scripts/install-helm.sh up scripts/install-helm.sh up
# install cephcsi helm charts # install cephcsi helm charts
@ -51,12 +44,8 @@ scripts/install-helm.sh install-cephcsi --namespace ${NAMESPACE}
# functional tests # functional tests
make run-e2e NAMESPACE="${NAMESPACE}" E2E_ARGS="--deploy-cephfs=false --deploy-rbd=false ${*}" make run-e2e NAMESPACE="${NAMESPACE}" E2E_ARGS="--deploy-cephfs=false --deploy-rbd=false ${*}"
#cleanup # cleanup
# skip snapshot operation if kube version is less than 1.17.0 scripts/install-snapshot.sh cleanup
if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
# delete snapshot CRD
scripts/install-snapshot.sh cleanup
fi
scripts/install-helm.sh cleanup-cephcsi --namespace ${NAMESPACE} scripts/install-helm.sh cleanup-cephcsi --namespace ${NAMESPACE}
scripts/install-helm.sh clean scripts/install-helm.sh clean
kubectl delete ns ${NAMESPACE} kubectl delete ns ${NAMESPACE}