[VOL-4114] Always sourcing the release file before kind-voltha commands
Change-Id: I123957db6e1212583c29a8b0c873cfcde721a390
diff --git a/jjb/pipeline/voltha/voltha-2.7/voltha-DMI-bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.7/voltha-DMI-bbsim-tests.groovy
index cbf04b8..4f45d15 100755
--- a/jjb/pipeline/voltha/voltha-2.7/voltha-DMI-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.7/voltha-DMI-bbsim-tests.groovy
@@ -64,6 +64,12 @@
stage('Cleanup') {
steps {
sh """
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down || ./voltha down
"""
@@ -168,6 +174,12 @@
gzip *-combined.log || true
## shut down voltha but leave kind-voltha cluster
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
cd $WORKSPACE/kind-voltha/
DEPLOY_K8S=n WAIT_ON_DOWN=y ./voltha down
kubectl delete deployment voltctl || true