commit 191ab048e4e666aa4a8a55354d7cc31457dcad45
author Andrea Campanella <andrea@opennetworking.org> Wed Feb 09 10:03:41 2022 +0000
committer Gerrit Code Review <gerrit@opencord.org> Wed Feb 09 10:03:41 2022 +0000
tree 8d0ed6ee37b334aab6687258d9754dd933668596
parent b233ce4d924ce29f2a156a23274df304ec3486d1
parent 15f62dd59ccb83228c69a404397edcf7aa6d6331

Merge "VOL-4560: Add more check in soak-pod jobs to check if memory is increasing over time"

jjb/pipeline/voltha/master/voltha-scale-test.groovy

diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 0ef497e..6ec2fe3 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -465,6 +465,7 @@
               -v withEapol:${withEapol} \
               -v withDhcp:${withDhcp} \
               -v withIgmp:${withIgmp} \
+              -v withMaclearning:${withMaclearning} \
               --noncritical non-critical \
               -e onu-upgrade -e igmp -e teardown "
 
@@ -533,6 +534,7 @@
                   -v withEapol:${withEapol} \
                   -v withDhcp:${withDhcp} \
                   -v withIgmp:${withIgmp} \
+                  -v withMaclearning:${withMaclearning}
                   -v image_version:BBSM_IMG_00002 \
                   -v image_url:http://bbsim0:50074/images/software-image.img \
                   -v image_vendor:BBSM \
@@ -601,6 +603,7 @@
                   -v withEapol:${withEapol} \
                   -v withDhcp:${withDhcp} \
                   -v withIgmp:${withIgmp} \
+                  -v withMaclearning:${withMaclearning}
                   -v ONOS_SSH_PORT:30115 \
                   -v ONOS_REST_PORT:30120 \
                   --noncritical non-critical \
@@ -654,6 +657,7 @@
                   -v withEapol:${withEapol} \
                   -v withDhcp:${withDhcp} \
                   -v withIgmp:${withIgmp} \
+                  -v withMaclearning:${withMaclearning} \
                   --noncritical non-critical \
                   -i teardown"
 
@@ -848,6 +852,10 @@
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 mcast-host-show > $LOG_FOLDER/onos-mcast-host-show.txt
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 groups > $LOG_FOLDER/onos-groups.txt
         fi
+
+        if [ ${withMaclearning} = true ] ; then
+           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 mac-learner-get-mapping > $LOG_FOLDER/onos-maclearning-host-mappings.txt
+        fi
       '''
       // collect etcd metrics
       sh '''

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 215db0c..34d041d 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -133,6 +133,7 @@
           withEapol: false
           withDhcp: true
           withIgmp: true
+          withMaclearning: true
           onosReplicas: 3
           atomixReplicas: 3
           extraHelmFlags: >
@@ -564,6 +565,11 @@
           description: 'Whether IGMP is enabled for the test'
 
       - bool:
+          name: withMaclearning
+          default: '{withMaclearning}'
+          description: 'Whether mac learning is enabled for the test'
+
+      - bool:
           name: withLLDP
           default: '{withLLDP}'
           description: 'Whether Link Discovery is enabled for the test'
@@ -748,6 +754,7 @@
     withEapol: true
     withDhcp: true
     withIgmp: false
+    withMaclearning: false
     withLLDP: false
     withMonitoring: true
     withProfiling: false
@@ -854,6 +861,7 @@
     withEapol: true
     withDhcp: true
     withIgmp: false
+    withMaclearning: false
     withLLDP: false
     withMonitoring: false
     withProfiling: false