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('.'))
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 1ee9f9f..acb9e0b 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -1,7 +1,29 @@
---
-# voltha 2.X tests
+
+# -----------------------------------------------------------------------
+# Copyright 2021-2024 Open Networking Foundation Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+# SPDX-FileCopyrightText: 2021-2024 Open Networking Foundation Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+# Entropy: 0fcb5ffa-d1a4-11ee-be5e-9f44b7181764
+# -----------------------------------------------------------------------
+# Intent: voltha 2.X tests
# oar image URLs that redirect away from oss to maven-central (?)
# olt, dhcpl2relay, igmpproxy, kafka
+# -----------------------------------------------------------------------
- project:
name: software-upgrades