commit f2464e18b66b69d83c13e376dfb15216ed9aacac
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Mar 28 15:37:18 2022 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Mon Mar 28 15:37:18 2022 -0700
tree a96f3f716f0d2e2364851885e0044277090c9ad8
parent 633a2eb6249cd58250eec81c4218df959a381d3e

Using local chart for voltha-2.9 installations

Change-Id: Ibb7f17bcd73cdf4199538bed39f28822bbbb7444

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

diff --git a/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy
index f039841..2fdfc38 100755
--- a/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy
@@ -54,7 +54,7 @@
 
           // if we're downloading a voltha-helm-charts patch, then install from a local copy of the charts
           def localCharts = false
-          if (volthaHelmChartsChange != "" || gerritProject == "voltha-helm-charts") {
+          if (volthaHelmChartsChange != "" || gerritProject == "voltha-helm-charts" || branch != "master") {
             localCharts = true
           }
 

jjb/pipeline/voltha/voltha-2.9/physical-build.groovy

diff --git a/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy b/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy
index 51313a6..0cce069 100644
--- a/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy
+++ b/jjb/pipeline/voltha/voltha-2.9/physical-build.groovy
@@ -96,7 +96,7 @@
           script {
             // if we're downloading a voltha-helm-charts patch, then install from a local copy of the charts
             def localCharts = false
-            if (volthaHelmChartsChange != "") {
+            if (volthaHelmChartsChange != "" || branch != "master") {
               localCharts = true
             }