installKind
Change-Id: Ib044b994a0d989f043fc68a4a018f27094052d99
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index b2c3104..f66b29d 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -547,23 +547,15 @@
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
- stage('Install Kind')
- {
- steps
- {
- script
- {
+ stage('Install Tools') {
+ steps {
+ script {
+ String branchName = branchName()
+ String iam = getIam('Install Tools')
- String cmd = [
- 'make',
- '--no-print-directory',
- '-C', "$WORKSPACE/voltha-system-tests",
- "KIND_PATH=\"$WORKSPACE/bin\"",
- 'install-command-kind',
- ].join(' ')
-
- println(" ** Running: ${cmd}")
- sh("${cmd}")
+ println("${iam}: ENTER (branch=$branch)")
+ installKind(branch) // needed early by stage(Cleanup)
+ println("${iam}: LEAVE (branch=$branch)")
} // script
} // steps
} // stage
diff --git a/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy b/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy
index cbbf43e..7cfa54b 100755
--- a/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/software-upgrades.groovy
@@ -21,6 +21,36 @@
remote: 'https://gerrit.opencord.org/ci-management.git'
])
+// -----------------------------------------------------------------------
+// Intent:
+// -----------------------------------------------------------------------
+String branchName() {
+ String name = 'voltha-2.12'
+
+ // [TODO] Sanity check the target branch
+ // if (name != jenkins.branch) { fatal }
+ return(name)
+}
+
+// -----------------------------------------------------------------------
+// Intent: Due to lack of a reliable stack trace, construct a literal.
+// Jenkins will re-write the call stack for serialization.
+// -----------------------------------------------------------------------
+String getIam(String func) {
+ String branchName = branchName()
+ String src = [
+ 'ci-management',
+ 'jjb',
+ 'pipeline',
+ 'voltha',
+ branchName,
+ 'software-upgrades.groovy'
+ ].join('/')
+
+ String name = [src, func].join('::')
+ return(name)
+}
+
// fetches the versions/tags of the voltha component
// returns the deployment version which is one less than the latest available tag of the repo, first voltha stack gets deployed using this;
// returns the test version which is the latest tag of the repo, the component upgrade gets tested on this.
@@ -261,16 +291,15 @@
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
- stage('Install Tools')
- {
- steps
- {
- script
- {
+ stage('Install Tools') {
+ steps {
+ script {
+ String branchName = branchName()
String iam = getIam('Install Kind')
- println("${iam}: ENTER")
- installKind("$branch") // needed early by stage(Cleanup)
- println("${iam}: LEAVE")
+
+ println("${iam}: ENTER (branch=$branch)")
+ installKind(branch) // needed early by stage(Cleanup)
+ println("${iam}: LEAVE (branch=$branch)")
} // script
} // steps
} // stage