Merge "Using local chart for voltha-2.9 installations"
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
}
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
}