commit 2b164340f77dd1bd1241fdff3a8a58d0e5e36956
author Hardik Windlass <hardik@opennetworking.org> Mon Feb 28 03:50:48 2022 +0000
committer Hardik Windlass <hardik@opennetworking.org> Mon Feb 28 05:37:34 2022 +0000
tree aedc72aa5890b0ffd961f2e749d3d6d1a6a5b069
parent 810b6cf1ce4506d997ead1b1c3ce501dea988ed3

Fixed check for withMacLearning config param in volthaDeploy

Change-Id: I5b90ccf5a121f329500824066ea64f900ad0c482

jjb/pipeline/voltha/master/bbsim-tests.groovy

diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index a164d55..fefa4d4 100755
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -73,7 +73,7 @@
             infraNamespace: infraNamespace,
             volthaNamespace: volthaNamespace,
             workflow: workflow.toLowerCase(),
-            withMacLearning: enableMacLearning,
+            withMacLearning: enableMacLearning.toBoolean(),
             extraHelmFlags: localHelmFlags,
             localCharts: localCharts,
             bbsimReplica: olts.toInteger(),

jjb/software-upgrades.yaml

diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 5fa684e..8e1365c 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -14,13 +14,13 @@
           aaa-version: '2.6.0.SNAPSHOT'
           aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.6.0-SNAPSHOT/aaa-app-2.6.0-20211227.162925-1.oar'
           olt-version: '5.1.0.SNAPSHOT'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.1.0-SNAPSHOT/olt-app-5.1.0-20220209.100550-7.oar'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.1.0-SNAPSHOT/olt-app-5.1.0-20220217.163818-8.oar'
           dhcpl2relay-version: '2.7.0.SNAPSHOT'
           dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.7.0-SNAPSHOT/dhcpl2relay-app-2.7.0-20211227.173623-1.oar'
           igmpproxy-version: '2.5.0.SNAPSHOT'
           igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.5.0-SNAPSHOT/onos-app-igmpproxy-app-2.5.0-20211227.182108-1.oar'
           sadis-version: '5.6.0.SNAPSHOT'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.6.0-SNAPSHOT/sadis-app-5.6.0-20220208.143514-4.oar'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.6.0-SNAPSHOT/sadis-app-5.6.0-20220217.161332-5.oar'
           mcast-version: '2.6.0.SNAPSHOT'
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.6.0-SNAPSHOT/mcast-app-2.6.0-20211227.170629-1.oar'
           kafka-version: '2.9.0.SNAPSHOT'
@@ -52,7 +52,7 @@
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
           kafka-version: '2.7.0'
           kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.11'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.12'
           adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.26'
           rw-core-image: 'voltha/voltha-rw-core:2.9.6'
           ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'

vars/volthaStackDeploy.groovy

diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 37a00d2..bea044b 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -8,6 +8,7 @@
       stackName: "voltha",
       stackId: 1, // NOTE this is used to differentiate between BBSims across multiple stacks
       workflow: "att",
+      withMacLearning: false,
       extraHelmFlags: "",
       localCharts: false,
       onosReplica: 1,