Fix a repository issue
jjb/software-upgrades.yaml
--------------------------
o Added a copyright notice.
o Cosmetic yaml edits to force a job to run.
jjb/pipeline/voltha/software-upgrades.groovy
--------------------------------------------
o Changed https://github to https://gerrit for consistency.
o Branch deletions are not mirrored out to github and stray
entries can cause problems for docker image retrieval.
o Querying gerrit (current source of truth) will return valid branches.
test/bats/
----------
o Add BATS unit tests to validate 'git ls' code snippet
from the software-upgrade.groovy pipeline script.
Change-Id: Id6e7f7a77f8a0b5b7a904fafa42ea81f7c6342a5
diff --git a/jjb/pipeline/voltha/software-upgrades.groovy b/jjb/pipeline/voltha/software-upgrades.groovy
index e169d1b..19b8a6e 100755
--- a/jjb/pipeline/voltha/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/software-upgrades.groovy
@@ -67,13 +67,24 @@
// returns the test version which is the latest tag of the repo, the component upgrade gets tested on this.
// Note: if there is a major version change between deployment and test tags, then deployment tag will be same as test tag, i.e. both as latest.
// -----------------------------------------------------------------------
+// git ls repo: gerrit (source of truth) VS github (mirror)
+// Branch deletions are not mirrored out to github.
+// Always perform checkouts/queries using the gerrit server as added
+// insulation to guard against repository deltas.
+// -----------------------------------------------------------------------
+// [TODO] Revisit logic:
+// o Refactor logic into a standalone shell script.
+// o Redundancy can be removed and a script will be testable.
+// -----------------------------------------------------------------------
def get_voltha_comp_versions(component, base_deploy_tag) {
def comp_test_tag = sh(
- script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
+ // script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
+ script: "git ls-remote --refs --tags https://gerrit.opencord.org/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
returnStdout: true
).trim()
def comp_deploy_tag = sh(
- script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
+ // script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
+ script: "git ls-remote --refs --tags https://gerrit.opencord.org/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
returnStdout: true
).trim()
def comp_deploy_major = comp_deploy_tag.substring(0, comp_deploy_tag.indexOf('.'))