commit 15357c03ba261ac60e3dc98a6a42d4b1718a05a6
author Hung-Wei Chiu <hungwei@opennetworking.org> Thu Apr 29 18:46:46 2021 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu Apr 29 18:46:46 2021 +0000
tree ef2de6b6dd1862b7fbb3a4b5457977030476afec
parent 59f312e74163006443c12a2f24b6cacf9df6ca68
parent 61e85715d3c1f160f16e5d298cbca12774db7a31

Merge "Install github-release binary"

jjb/maven.yaml

diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index ac461dc..162209f 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -138,3 +138,4 @@
           settings: 'cord-apps-maven-settings'
           settings-type: cfp
           goals: '-Prelease clean deploy'
+          maven-version: '{maven-version}'

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 2c99359..14d84b0 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -334,6 +334,7 @@
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 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 30115 karaf@127.0.0.1 cfg set org.onosproject.provider.of.group.impl.OpenFlowGroupProvider groupPollInterval ${onosGroupInterval}
           sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.FlowObjectiveManager numThreads ${flowObjWorkerThreads}
+          sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.InOrderFlowObjectiveManager objectiveTimeoutMs 300000
 
           if [ ${withFlows} = false ]; then
             sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 app deactivate org.opencord.olt

jjb/verify/osam.yaml

diff --git a/jjb/verify/osam.yaml b/jjb/verify/osam.yaml
index 4473e36..a09a43d 100644
--- a/jjb/verify/osam.yaml
+++ b/jjb/verify/osam.yaml
@@ -91,6 +91,7 @@
       - maven-target:
           goals: "test"
           pom: "pom.xml"
+          maven-version: '{maven-version}'
 
     publishers:
       - postbuildscript:

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index eca1d68..7788cf1 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -99,7 +99,7 @@
           withIgmp: true
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
+          extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.rw_core.core_timeout=60s --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