From 69091b9273b3e05a9c3efa716dd3ab5e71fd4834 Mon Sep 17 00:00:00 2001 From: Yug Date: Thu, 22 Apr 2021 15:07:20 +0530 Subject: [PATCH] ci: pass namespace after --namespace flag Since we are adding support for deployment of sc and secret via flags, to help script recognize when an unknown string is passed as a namespace, use --namespace flag before entering the namespace. Signed-off-by: Yug --- mini-e2e-helm.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mini-e2e-helm.groovy b/mini-e2e-helm.groovy index 67c23b205..3e6383806 100644 --- a/mini-e2e-helm.groovy +++ b/mini-e2e-helm.groovy @@ -172,7 +172,7 @@ node('cico-workspace') { timeout(time: 30, unit: 'MINUTES') { ssh 'cd /opt/build/go/src/github.com/ceph/ceph-csi && ./scripts/install-helm.sh up' ssh "kubectl create namespace '${namespace}'" - ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && ./scripts/install-helm.sh install-cephcsi '${namespace}'" + ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && ./scripts/install-helm.sh install-cephcsi --namespace '${namespace}'" } } stage('run e2e') { @@ -182,7 +182,7 @@ node('cico-workspace') { } stage('cleanup ceph-csi deployment') { timeout(time: 30, unit: 'MINUTES') { - ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && ./scripts/install-helm.sh cleanup-cephcsi '${namespace}'" + ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && ./scripts/install-helm.sh cleanup-cephcsi --namespace '${namespace}'" ssh 'cd /opt/build/go/src/github.com/ceph/ceph-csi && ./scripts/install-helm.sh clean' ssh "kubectl delete namespace '${namespace}'" }