Merge "Restore error-report.log"
diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index 082703c..12c65b0 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -175,21 +175,23 @@
csvSeries: [[displayTableFlag: false, exclusionValues: '', file: 'onu-activation.txt', inclusionFlag: 'OFF', url: ''], [displayTableFlag: false, exclusionValues: '', file: 'total-time.txt', inclusionFlag: 'OFF', url: '']],
group: 'Voltha-Scale-Numbers', numBuilds: '100', style: 'line', title: 'Time (200ms Delay)', useDescr: true, yaxis: 'Time (s)'
])
- archiveArtifacts artifacts: '*.log,*.txt'
script {
sh '''
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
+ voltctl device list -o json > device-list.json
+ python -m json.tool device-list.json > volt-device-list.json
+ rm device-list.json
+ rm port-recognition.txt
+ rm activation-time.txt
+ sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@localhost ports > onos-ports.txt
'''
}
+ archiveArtifacts artifacts: '*.log,*.json,*txt'
}
success {
sh '''
#!/usr/bin/env bash
set +e
- rm onu-activation.txt
- rm total-time.txt
- rm port-recognition.txt
- rm activation-time.txt
'''
}
}
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index e43df51..8f28ad7 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -8,36 +8,116 @@
jobs:
- 'voltha-scale-measurements-periodic':
- name: 'voltha-scale-measurements-periodic-256-200ms'
+ name: 'voltha-scale-measurements-periodic-8-32-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "0 * * * *"
+ time-trigger: "H H/3 * * *"
onuPerPon: 32
ponPorts: 8
expectedOnus: 256
BBSIMdelay: 200
- 'voltha-scale-measurements-periodic':
- name: 'voltha-scale-measurements-periodic-128-200ms'
+ name: 'voltha-scale-measurements-periodic-8-32-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "15 * * * *"
- onuPerPon: 32
- ponPorts: 4
- expectedOnus: 128
- BBSIMdelay: 200
- - 'voltha-scale-measurements-periodic':
- name: 'voltha-scale-measurements-periodic-256-1000ms'
- build-node: 'onf-pod1-head-node'
- time-trigger: "30 * * * *"
+ time-trigger: "H H/3 * * *"
onuPerPon: 32
ponPorts: 8
expectedOnus: 256
BBSIMdelay: 1000
- 'voltha-scale-measurements-periodic':
- name: 'voltha-scale-measurements-periodic-128-1000ms'
+ name: 'voltha-scale-measurements-periodic-4-32-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "45 * * * *"
+ time-trigger: "H H/3 * * *"
onuPerPon: 32
ponPorts: 4
expectedOnus: 128
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-4-32-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 32
+ ponPorts: 4
+ expectedOnus: 128
+ BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-16-32-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 32
+ ponPorts: 16
+ expectedOnus: 128
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-16-32-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 32
+ ponPorts: 16
+ expectedOnus: 128
+ BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-4-64-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 64
+ ponPorts: 4
+ expectedOnus: 256
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-4-64-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 64
+ ponPorts: 4
+ expectedOnus: 256
+ BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-4-128-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 128
+ ponPorts: 4
+ expectedOnus: 256
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-4-128-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 128
+ ponPorts: 4
+ expectedOnus: 256
+ BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-1-128-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 128
+ ponPorts: 1
+ expectedOnus: 256
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-1-128-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 128
+ ponPorts: 1
+ expectedOnus: 256
+ BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-1-64-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 64
+ ponPorts: 1
+ expectedOnus: 256
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-1-64-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/3 * * *"
+ onuPerPon: 64
+ ponPorts: 1
+ expectedOnus: 256
BBSIMdelay: 1000
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-dev'