[VOL-2944] Support worflow parameter in test jobs
Change-Id: I0c378e754c3c3fd1694d89a7b9372046ec64208f
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 76da0cb..6f36724 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -915,7 +915,7 @@
- string:
name: workFlow
default: '{work-flow}'
- description: 'Installs the specified work flow on the POD'
+ description: 'Installs and uses the specified work flow on the POD'
- string:
name: NumOfOpenOnu
@@ -1028,6 +1028,11 @@
default: '{manifest-branch}'
description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
+ - string:
+ name: workFlow
+ default: '{work-flow}'
+ description: 'Installs and uses the specified work flow on the POD'
+
- bool:
name: powerSwitch
default: '{power-switch}'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index f9f64b0..266f450 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -216,6 +216,7 @@
release: 'master'
branch: 'master'
name-extension: '_DT'
+ work-flow: 'DT'
test-repo: 'voltha-system-tests'
profile: '1T8GEM'
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
@@ -243,6 +244,7 @@
release: '2.3'
branch: 'voltha-2.3'
name-extension: '_DT'
+ work-flow: 'DT'
test-repo: 'voltha-system-tests'
profile: '1T8GEM'
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
@@ -407,6 +409,7 @@
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
name-extension: '_DT'
+ work-flow: 'DT'
release: 'master'
branch: 'master'
test-repo: 'voltha-system-tests'
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index 61e3617..308b1ab 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -78,7 +78,7 @@
environment {
ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
ROBOT_FILE="Voltha_DT_PODTests.robot"
- ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow"
+ ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/FunctionalTests"
}
steps {
sh """
@@ -92,6 +92,20 @@
"""
}
}
+
+ stage('Error Scenario Tests') {
+ environment {
+ ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
+ ROBOT_FILE="Voltha_ErrorScenarios.robot"
+ ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/ErrorScenarios"
+ }
+ steps {
+ sh """
+ mkdir -p $ROBOT_LOGS_DIR
+ export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v workflow:${params.workFlow} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
+ """
+ }
}
post {
always {