Fix the sanity-test in DT workflow
- Add the new parameter workFlow in pipeline to choose the environment
passed to voltha script
Change-Id: I84ce473b8e110291c88736f24f67f0d0034ee64c
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index fc1d613..c0fc8b9 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -31,12 +31,12 @@
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$HOME/kind-voltha/bin"
TYPE="minimal"
FANCY=0
- WITH_SIM_ADAPTERS="n"
- WITH_RADIUS="y"
- WITH_BBSIM="y"
- DEPLOY_K8S="y"
+ WITH_SIM_ADAPTERS="no"
+ WITH_RADIUS="yes"
+ WITH_BBSIM="yes"
+ DEPLOY_K8S="yes"
VOLTHA_LOG_LEVEL="DEBUG"
- CONFIG_SADIS="n"
+ CONFIG_SADIS="no"
ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs"
}
stages {
@@ -83,6 +83,13 @@
echo "on master, using default settings for kind-voltha"
fi
+ if [ "${workFlow}" == "DT" ]; then
+ export WITH_DHCP=no
+ export WITH_IGMP=no
+ export WITH_EAPOL=no
+ export WITH_RADIUS=no
+ fi
+
EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${params.extraHelmFlags} "
cd $HOME/kind-voltha/
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 9a1ffb2..439c794 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -140,6 +140,7 @@
onus: 1
pons: 1
time-trigger: "@daily"
+ work-flow: DT
# Per-patchset Pod builds on Tucson pod
- 'verify_physical_voltha_patchset_auto':
@@ -174,6 +175,7 @@
test-runs: 1
robot-args: ''
gerrit-project: ''
+ work-flow: ''
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -241,6 +243,10 @@
default: '{robot-args}'
description: 'Arguments to pass to robot'
+ - string:
+ name: workFlow
+ default: '{work-flow}'
+ description: 'Workflow for testcase'
project-type: pipeline
concurrent: true