Add in a few more fixes
Change-Id: I42b9eff6267e864901f0cd8ce28f96ca6f8cc1ae
diff --git a/vars/waitForAdapters.groovy b/vars/waitForAdapters.groovy
index a293fa5..5436c71 100644
--- a/vars/waitForAdapters.groovy
+++ b/vars/waitForAdapters.groovy
@@ -8,7 +8,7 @@
{
String src = 'vars/waitForAdapters.groovy'
String iam = [src, func].join('::')
- return
+ return iam
}
// -----------------------------------------------------------------------
@@ -196,10 +196,10 @@
throw new Exception("ERROR: Timed out waiting on adapter startup")
}
- println("** ${iam}: Wait for adapter LastCommunication")
+ println("** ${iam}: Tearing down port forwarding")
sh("""
set +x
- pgrep --list-full port-forw
+ pgrep --list-full 'port\-forw' || true
ps aux \
| grep port-forw \