commit 15f2294ecc9e58d45eb812a94f3bb14706bba966
author Andrea Campanella <andrea@opennetworking.org> Thu Apr 08 17:24:21 2021 +0200
committer Andrea Campanella <andrea@opennetworking.org> Thu Apr 08 17:35:44 2021 +0200
tree cec54b0205de13a2ba533b692c839ea793ffccc1
parent e271607fad6e293b2b764b1b59d516d23e4a7a1f

Add empty space for extra helm flags and groupPollInterval

Change-Id: Iea5002fb9095aa734734e5bddbce190e7f7fd390

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 818e24d..5a50e53 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -272,10 +272,11 @@
             """).trim()
 
             def extraHelmFlags = returned_flags
+            // The added space before params.extraHelmFlags is required due to the .trim() above
             def infraHelmFlags =
               " --set etcd.enabled=false,kafka.enabled=false" +
               " --set global.log_level=${logLevel} " +
-              extraHelmFlags + params.extraHelmFlags
+              extraHelmFlags + " " + params.extraHelmFlags
 
             println "Passing the following parameters to the VOLTHA infra deploy: ${infraHelmFlags}."
 
@@ -360,9 +361,10 @@
 
           kubectl exec \$(kubectl get pods | grep -E "bbsim[0-9]" | awk 'NR==1{print \$1}') -- bbsimctl log ${logLevel.toLowerCase()} false
 
-          # Set Flows/Ports/Meters poll frequency
+          # Set Flows/Ports/Meters/Groups poll frequency
           sshpass -e ssh -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 -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 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.provider.of.group.impl.OpenFlowGroupProvider groupPollInterval ${onosGroupInterval}
 
           if [ ${withFlows} = false ]; then
             sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 app deactivate org.opencord.olt

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index f5d8c89..6a33653 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -100,6 +100,7 @@
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
           onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
+          bbsimImg: matteoscandolo/bbsim:gemport
 
       # multi-stack jobs
       - 'voltha-scale-measurements':
@@ -528,6 +529,11 @@
           description: 'How often ONOS should poll for ports, flows and meters'
 
       - string:
+          name: onosGroupInterval
+          default: '{onosGroupInterval}'
+          description: 'How often ONOS should poll for groups'
+
+      - string:
           name: bbsimImg
           default: '{bbsimImg}'
           description: 'Custom image selection for BBSIM (repo:tag)'
@@ -683,6 +689,7 @@
     etcdReplicas: 3
     extraHelmFlags: ''
     onosStatInterval: 5
+    onosGroupInterval: 1
     volthaSystemTestsChange: ''
     volthaHelmChartsChange: ''
     kindVolthaChange: ''
@@ -785,6 +792,7 @@
     etcdReplicas: 1
     extraHelmFlags: ''
     onosStatInterval: 5
+    onosGroupInterval: 1
     volthaSystemTestsChange: ''
     volthaHelmChartsChange: ''
     kindVolthaChange: ''