fix etcd prefix and voltha down and up issue for openonu-go nightly job
Change-Id: Id0b2e1d620260c99d3213faf70dde10a80080798
diff --git a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
index 22ec908..461500b 100755
--- a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
@@ -119,6 +119,7 @@
mkdir -p $ROBOT_LOGS_DIR/1t1gem
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
export TARGET_DEFAULT=openonu-go-adapter-test
+ export NAME=voltha_voltha
make -C $WORKSPACE/voltha-system-tests \$TARGET_DEFAULT || true
@@ -143,13 +144,22 @@
}
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} "
+
# start logging
mkdir -p $WORKSPACE/1t4gem
_TAG=kail-1t4gem kail -n voltha -n default > $WORKSPACE/1t4gem/onos-voltha-combined.log &
+ DEPLOY_K8S=n ./voltha up
+
mkdir -p $ROBOT_LOGS_DIR/1t4gem
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
export TARGET_DEFAULT=1t4gem-openonu-go-adapter-test
+ export NAME=voltha_voltha
make -C $WORKSPACE/voltha-system-tests \$TARGET_DEFAULT || true
@@ -174,6 +184,12 @@
}
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} "
+
# start logging
mkdir -p $WORKSPACE/1t8gem
_TAG=kail-1t8gem kail -n voltha -n default > $WORKSPACE/1t8gem/onos-voltha-combined.log &
@@ -183,6 +199,7 @@
mkdir -p $ROBOT_LOGS_DIR/1t8gem
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
export TARGET_1T8GEM=1t8gem-openonu-go-adapter-test
+ export NAME=voltha_voltha
make -C $WORKSPACE/voltha-system-tests \$TARGET_1T8GEM || true