commit 955636e6793543660c0a35fb80026a07fbe8dec7
author Matteo Scandolo <teo@opennetworking.org> Thu Sep 24 16:43:15 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu Sep 24 16:43:15 2020 +0000
tree 30a621c276bb71f8b98f285819fd56f5879370f9
parent 698374d0fa9e6b0e3fc41078f515aaf9a330b5ac
parent bbd8f90ed0afc174520b603547c2d3818318f851

Merge "Using latest TT image and collecting more ONOS info in the scale pipeline"

jjb/pipeline/voltha-scale-test.groovy

diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 7e4a2c4..7ac8430 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -277,8 +277,6 @@
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.provider.of.flow.impl.OpenFlowRuleProvider flowPollFrequency ${onosStatInterval}
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.provider.of.device.impl.OpenFlowDeviceProvider portStatsPollFrequency ${onosStatInterval}
 
-          sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 app deactivate org.opencord.maclearner
-
           if [ ${withFlows} = false ]; then
             sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 app deactivate org.opencord.olt
           fi
@@ -496,6 +494,12 @@
       '''
       // get ONOS debug infos
       sh '''
+
+        sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 apps -a -s > $LOG_FOLDER/onos-apps.txt || true
+        sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 nodes > $LOG_FOLDER/onos-nodes.txt || true
+        sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 masters > $LOG_FOLDER/onos-masters.txt || true
+        sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 roles > $LOG_FOLDER/onos-roles.txt || true
+
         sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 ports > $LOG_FOLDER/onos-ports-list.txt || true
         sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 hosts > $LOG_FOLDER/onos-hosts-list.txt || true
 

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index ee98906..9efc613 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -78,6 +78,8 @@
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           withPcap: true
+          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final'
+          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-1-16-32-tt-subscribers'
@@ -97,8 +99,8 @@
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           withPcap: true
-          onosImg: 'matteoscandolo/voltha-onos:dhcp'
           logLevel: INFO
+          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final'
           onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
@@ -119,6 +121,8 @@
           openonuAdapterReplicas: 8
           onosReplicas: 3
           atomixReplicas: 3
+          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final'
+          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
 
       # jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
       - 'voltha-scale-measurements':
@@ -157,7 +161,6 @@
           extraHelmFlags: '--set auth=false '
 
       - 'voltha-scale-measurements':
-          'disable-job': true
           name: 'voltha-scale-measurements-master-2-16-32-att-subscribers'
           build-node: 'onf-pod1-head-node'
           time-trigger: "H H/4 * * *"
@@ -173,6 +176,8 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
+          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final'
+          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
       - 'voltha-scale-measurements':
@@ -192,6 +197,8 @@
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
+          onosImg: 'andreacampanella/voltha-onos:dhcp-executor-host-logging-final'
+          onosChart: /home/cord/onos-classic-charts/onos-helm-charts/onos-classic
 
       # voltha-2.5 Jobs
       - 'voltha-scale-measurements':