Enabling scale jobs
Removing port-forward left around from other jobs
Change-Id: Ibfb595c73a53faf9fcaff23a85035103a9fa09ed
diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index 5a56f29..6574492 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -101,6 +101,9 @@
cd $WORKSPACE
rm -rf $WORKSPACE/*
+
+ # remove orphaned port-forward from different namespaces
+ ps aux | grep port-forw | grep -v grep | awk '{print \$2}' | xargs --no-run-if-empty kill -9
"""
}
}
diff --git a/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
index 5414449..15143e7 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
@@ -45,6 +45,10 @@
stage ('Cleanup') {
steps {
timeout(time: 11, unit: 'MINUTES') {
+ sh """
+ # remove orphaned port-forward from different namespaces
+ ps aux | grep port-forw | grep -v grep | awk '{print \$2}' | xargs --no-run-if-empty kill -9
+ """
script {
def namespaces = ["infra"]
// FIXME we may have leftovers from more VOLTHA stacks (eg: run1 had 10 stacks, run2 had 2 stacks)
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 261d38d..a6f3113 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -109,7 +109,7 @@
name: 'voltha-scale-measurements-master-experimental-multi-stack'
build-node: 'voltha-scale-2'
pipeline-script: 'voltha/master/voltha-scale-multi-stack.groovy'
- 'disable-job': true
+ 'disable-job': false
# trigger on Feb 29th (a.k.a only trigger it manually)
time-trigger: "H 0 29 2 *"
withMonitoring: true
@@ -362,7 +362,7 @@
name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-att-subscribers'
build-node: 'voltha-scale-2'
pipeline-script: 'voltha-scale-multi-stack.groovy'
- 'disable-job': true
+ 'disable-job': false
time-trigger: "H H/4 * * *"
withMonitoring: false
logLevel: WARN
@@ -389,7 +389,7 @@
name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-dt-subscribers'
build-node: 'voltha-scale-2'
pipeline-script: 'voltha-scale-multi-stack.groovy'
- 'disable-job': true
+ 'disable-job': false
time-trigger: "H H/4 * * *"
withMonitoring: false
logLevel: WARN
@@ -416,7 +416,7 @@
name: 'voltha-scale-measurements-2.6-10-stacks-2-16-32-tt-subscribers'
build-node: 'voltha-scale-2'
pipeline-script: 'voltha-scale-multi-stack.groovy'
- 'disable-job': true
+ 'disable-job': false
time-trigger: "H H/4 * * *"
withMonitoring: false
logLevel: WARN