Merge "Extending timeout and collecting per stack robot results Moving the multi-stack to the DT workflow"
diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index c8c5323..b751a26 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -21,7 +21,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 60, unit: 'MINUTES')
+ timeout(time: 120, unit: 'MINUTES')
}
environment {
JENKINS_NODE_COOKIE="dontKillMe" // do not kill processes after the build is done
@@ -420,11 +420,6 @@
kubectl cp $INSTANCE:out.pcap $LOG_FOLDER/$INSTANCE.pcap || true
done
fi
-
- cd voltha-system-tests
- source ./vst_venv/bin/activate
- python tests/scale/collect-result.py -r $WORKSPACE/RobotLogs/output.xml -p $WORKSPACE/plots > $WORKSPACE/execution-time.txt || true
- cat $WORKSPACE/execution-time.txt
'''
sh '''
if [ ${withProfiling} = true ] ; then
@@ -721,6 +716,10 @@
source ./vst_venv/bin/activate
robot -d $WORKSPACE/RobotLogs/voltha${i} \
\$ROBOT_PARAMS tests/scale/Voltha_Scale_Tests.robot
+
+ # collect results
+ python tests/scale/collect-result.py -r $WORKSPACE/RobotLogs/voltha${i}/output.xml -p $WORKSPACE/plots > $WORKSPACE/execution-time-voltha${i}.txt || true
+ cat $WORKSPACE/execution-time-voltha${i}.txt
"""
}
}
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 856aa7c..cda6f4d 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -73,17 +73,18 @@
# time-trigger: "H 0 29 2 *"
time-trigger: "H H/4 * * *"
withMonitoring: false
+ logLevel: WARN
volthaStacks: 2
olts: 2
pons: 16
onus: 32
withFlows: true
provisionSubscribers: true
- withEapol: true
- withDhcp: true
+ workflow: dt
+ withEapol: false
+ withDhcp: false
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- withPcap: true
volthaSystemTestsChange: refs/changes/27/21627/2
kindVolthaChange: refs/changes/85/21485/8
openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:topic