Always sourcing the release file before deplying VOLTHA
Change-Id: I092015ec5694413a255620b55c94e1f06bf09a56
diff --git a/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
index 7842559..a82b9f1 100755
--- a/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
@@ -147,6 +147,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ 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
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# start logging
@@ -185,6 +192,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ 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
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# start logging
@@ -224,8 +238,14 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ 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
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
-
export EXTRA_HELM_FLAGS+="--set pon=2,onu=2,controlledActivation=only-onu "
# start logging
@@ -264,6 +284,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ 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
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# Workflow-specific flags
@@ -309,6 +336,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ 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
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# Workflow-specific flags
@@ -360,6 +394,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ 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
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# Workflow-specific flags