Do not wait for adapter in VOLTHA 2.8, only wait 5 minutes before force-removing ONOS
Change-Id: Ie1d90eeaecf4201f3ebb6734080a2b89337faeb7
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 0727840..91d5552 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -59,7 +59,7 @@
steps {
script {
try {
- timeout(time: 10, unit: 'MINUTES') {
+ timeout(time: 5, unit: 'MINUTES') {
sh returnStdout: false, script: '''
cd $WORKSPACE
rm -rf $WORKSPACE/*
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
index 636f953..bc14f57 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
@@ -62,7 +62,7 @@
steps {
script {
try {
- timeout(time: 10, unit: 'MINUTES') {
+ timeout(time: 5, unit: 'MINUTES') {
sh returnStdout: false, script: '''
cd $WORKSPACE
rm -rf $WORKSPACE/*
@@ -290,6 +290,7 @@
workflow: workflow,
extraHelmFlags: stackHelmFlags,
localCharts: localCharts,
+ adaptersToWait: 0, // no need to wait for adapters, 2.8 is kafka based
])
sh """
set +x