Make port-forwarding removal more robust
The pkill command in pkill_port_forward is wrapped by a pgrep guard
that looks for processes that need killing. The pgrep check is more
strict than the pkill command and prevents the execution of pkill
when it shouldn't.
We could simply drop the guard and handle the pkill exit status, but
we keep the guard for now and have it print information about matching
processes.
Instead of using "--count", rely on the pgrep exit status to indicate
if any matching processes were found.
While we're at it, fix the misleading label for the script.
Also include an extra change in jjb/ to trigger jenkins job in vars/.
Signed-off-by: Roger Luethi <roger@opennetworking.org>
Change-Id: I99158e5d6477091a2f9bf6d0c8431c0ca53ef1b2
diff --git a/jjb/pipeline/voltha/physical-build.groovy b/jjb/pipeline/voltha/physical-build.groovy
index 69537b3..8745ef5 100755
--- a/jjb/pipeline/voltha/physical-build.groovy
+++ b/jjb/pipeline/voltha/physical-build.groovy
@@ -16,7 +16,6 @@
// NOTE we are importing the library even if it's global so that it's
// easier to change the keywords during a replay
-
library identifier: 'cord-jenkins-libraries@master',
retriever: modernSCM([
$class: 'GitSCMSource',
diff --git a/vars/pkill_port_forward.groovy b/vars/pkill_port_forward.groovy
index 2de9759..7a0b235 100644
--- a/vars/pkill_port_forward.groovy
+++ b/vars/pkill_port_forward.groovy
@@ -85,11 +85,11 @@
}
sh(
- label : 'Display port forwarding',
+ label : 'Kill port forwarding',
// script : ${cmd}.toString(), -> Exception
script : """
echo -e "\n** vars/pkill_port_forward.groovy [DEBUG]: pgrep-pkill check"
-if [[ \$(pgrep --count 'port-forw') -gt 0 ]]; then
+if pgrep --uid \$(id -u) --list-full --full 'port-forw'; then
pkill --uid \$(id -u) --echo --list-full --full 'port-forw'
fi
""")