VOL-4795 - Researching berlin-community-pod issues.
vars/volthaInfraDeploy.groovy
-----------------------------
o Wrap call() in a try/catch/finally block for error visibility.
o Added named function doKubeNamespaces() to capture logic.
o Display namespace(s) prior to helm update, considering removal for clean install.
o Problem may be related to special case behavor trying to update a new creation
vars/volthaStackDeploy.groovy
-----------------------------
o Wrap call() in a try/catch/finally block for error visibility.
vars/waitForAdapter.groovy
--------------------------
o Fix iam() method name
o npm-groovy-lint cleanups
Change-Id: Ib9407b9cfefc40f411dbf9ab6e9e25adf9741a58
diff --git a/vars/waitForAdapters.groovy b/vars/waitForAdapters.groovy
index ecd1f10..3c441da 100644
--- a/vars/waitForAdapters.groovy
+++ b/vars/waitForAdapters.groovy
@@ -6,6 +6,7 @@
// -----------------------------------------------------------------------
def getIam(String func)
{
+ // Cannot rely on a stack trace due to jenkins manipulation
String src = 'vars/waitForAdapters.groovy'
String iam = [src, func].join('::')
return iam
@@ -69,7 +70,9 @@
{
String elapsed = adapters[i]
if (debug)
+ {
println("** ${iam} Checking elapsed[$i]: $elapsed")
+ }
if (! elapsed) // empty string or null
{
@@ -127,7 +130,9 @@
}
if (debug)
+ {
println("** ${iam} return: [$ans]")
+ }
return ans
} // getAdaptersState
@@ -193,7 +198,9 @@
// ----------------------------------------------------------
countdown -= 1
if (1 > countdown)
+ {
throw new Exception("ERROR: Timed out waiting on adapter startup")
+ }
}
println("** ${iam}: Tearing down port forwarding")
@@ -213,7 +220,7 @@
// -----------------------------------------------------------------------
def call(Map config)
{
- String iam = getIam('process')
+ String iam = getIam('main')
println("** ${iam}: ENTER")
if (!config) {