VOL-2827 Fix nightly library jobs by making branch parameter uniform
Change-Id: I9e31cda5f69622fbd02039a4f0e86e750fc7cc21
diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index 3f16f30..437b120 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -48,7 +48,7 @@
poll: false,
scm: [$class: 'RepoScm',
manifestRepositoryUrl: "${params.manifestUrl}",
- manifestBranch: "${params.manifestBranch}",
+ manifestBranch: "${params.branch}",
currentBranch: true,
destinationDir: 'voltha',
forceSync: true,
@@ -76,9 +76,9 @@
steps {
sh """
export EXTRA_HELM_FLAGS=""
- if [ "${manifestBranch}" != "master" ]; then
- echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
- source "$HOME/kind-voltha/releases/${manifestBranch}"
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$HOME/kind-voltha/releases/${branch}"
else
echo "on master, using default settings for kind-voltha"
fi
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index d020fcc..fc1d613 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -48,7 +48,7 @@
poll: false,
scm: [$class: 'RepoScm',
manifestRepositoryUrl: "${params.manifestUrl}",
- manifestBranch: "${params.manifestBranch}",
+ manifestBranch: "${params.branch}",
currentBranch: true,
destinationDir: 'voltha',
forceSync: true,
@@ -76,9 +76,9 @@
steps {
sh """
export EXTRA_HELM_FLAGS=""
- if [ "${manifestBranch}" != "master" ]; then
- echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
- source "$HOME/kind-voltha/releases/${manifestBranch}"
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$HOME/kind-voltha/releases/${branch}"
else
echo "on master, using default settings for kind-voltha"
fi
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 5892f75..6dac951 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -200,12 +200,12 @@
- string:
name: manifestUrl
default: '{gerrit-server-url}/{voltha-test-manifest-repo}'
- description: 'Repo manifest URL for code checkout (so we can display changes in Jenkins)'
+ description: 'Repo manifest URL for code checkout'
- string:
- name: manifestBranch
+ name: branch
default: '{code-branch}'
- description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
+ description: 'Repo manifest branch for code checkout'
- string:
name: gerritProject