Add missing quote, added func banner()
Change-Id: I7d9f0df308ce858ed659bffa8ce985cfdc8f1c10
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index 5fc14d4..9983ee9 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -88,6 +88,22 @@
}
// -----------------------------------------------------------------------
+// Intent: Display a message with visibility for logging
+// -----------------------------------------------------------------------
+String banner(String message) {
+ String iam = getIam('banner')
+
+ println("""
+
+** -----------------------------------------------------------------------
+** IAM: $iam
+** ${message}
+** -----------------------------------------------------------------------
+""")
+ return
+}
+
+// -----------------------------------------------------------------------
// Intent: Determine if working on a release branch.
// Note: Conditional is legacy, should also check for *-dev or *-pre
// -----------------------------------------------------------------------
@@ -472,18 +488,10 @@
// -----------------------------------------------------------------------
void collectArtifacts(exitStatus) {
script {
- String iam = getIam('collectArtifacts')
enter("exitStatus=${exitStatus}")
-
- println("""
-
-** -----------------------------------------------------------------------
-** IAM: $iam
-** collectArtifacts
-** -----------------------------------------------------------------------
-""")
+ banner('collectArtifacts')
}
-
+
dotkube(['debug':false])
getPodsInfo("$WORKSPACE/${exitStatus}")
diff --git a/vars/dotkube.groovy b/vars/dotkube.groovy
index 97b82c2..e451f42 100644
--- a/vars/dotkube.groovy
+++ b/vars/dotkube.groovy
@@ -63,7 +63,7 @@
{
sh("""/bin/ls -ld ~/.kube """)
sh("""find ~/.kube -print0 \
- | grep --null --null-data -e 'cache -e 'temp' \
+ | grep --null --null-data -e 'cache' -e 'temp' \
| xargs -0 /bin/ls -ld""")
// if (config['do-something']) {}
}
diff --git a/vars/volthaDeploy.groovy b/vars/volthaDeploy.groovy
index 1d83306..defcaf6 100644
--- a/vars/volthaDeploy.groovy
+++ b/vars/volthaDeploy.groovy
@@ -52,9 +52,12 @@
// Intent: Display a message with visibility for logging
// -----------------------------------------------------------------------
String banner(String message) {
+ String iam = getIam('banner')
+
println("""
** -----------------------------------------------------------------------
+** IAM: $iam
** ${message}
** -----------------------------------------------------------------------
""")