Using KV Store Prefix
Change-Id: Icbce8b4a418666a3143e797665af7ca253f877c0
diff --git a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
index 7a1ab22..e3129b8 100755
--- a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
@@ -119,7 +119,7 @@
mkdir -p $ROBOT_LOGS_DIR/1t1gem
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
- export NAME=voltha_voltha
+ export KVSTOREPREFIX=voltha_voltha
make -C $WORKSPACE/voltha-system-tests ${makeTarget} || true
@@ -145,7 +145,6 @@
steps {
sh '''
cd $WORKSPACE/kind-voltha/
- #source $NAME-env.sh
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
@@ -158,7 +157,7 @@
mkdir -p $ROBOT_LOGS_DIR/1t4gem
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
- export NAME=voltha_voltha
+ export KVSTOREPREFIX=voltha_voltha
make -C $WORKSPACE/voltha-system-tests ${make1t4gemTestTarget} || true
@@ -184,7 +183,6 @@
steps {
sh '''
cd $WORKSPACE/kind-voltha/
- #source $NAME-env.sh
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
@@ -197,7 +195,7 @@
mkdir -p $ROBOT_LOGS_DIR/1t8gem
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
- export NAME=voltha_voltha
+ export KVSTOREPREFIX=voltha_voltha
make -C $WORKSPACE/voltha-system-tests ${make1t8gemTestTarget} || true
@@ -224,7 +222,6 @@
steps {
sh '''
cd $WORKSPACE/kind-voltha/
- #source $NAME-env.sh
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
@@ -266,7 +263,6 @@
steps {
sh '''
cd $WORKSPACE/kind-voltha/
- #source $NAME-env.sh
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index e86d61f..d810638 100755
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -202,7 +202,6 @@
steps {
sh '''
cd $WORKSPACE/kind-voltha/
- #source $NAME-env.sh
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
@@ -231,7 +230,7 @@
export TARGET_1T8GEM=1t8gem-openonu-go-adapter-test
if [ "${branch}" != "voltha-2.6" ]; then
- export NAME=voltha_voltha
+ export KVSTOREPREFIX=voltha_voltha
fi
make -C $WORKSPACE/voltha-system-tests \$TARGET_1T8GEM || true
@@ -258,7 +257,6 @@
steps {
sh '''
cd $WORKSPACE/kind-voltha/
- #source $NAME-env.sh
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "