Escape --uid uid=1000(joey) gid=1000(joey) groups=1000(joey),4(adm),24(cdrom),27(sudo),30(dip),46(plugdev),109(kvm),122(lpadmin),132(lxd),133(sambashare),138(docker) before passing to sh()
Change-Id: I375bcf25d18637bb1f1ad0343f8b10eeebb0930e
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index f71e75e..c381dfc 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -140,17 +140,17 @@
sh(label : 'pgrep_proc - kill-pre',
script : """
-pgrep --uid "$(uid -u)" --list-full --full 'kubectl.*port-forward'
+pgrep --uid "\$(id -u)" --list-full --full 'kubectl.*port-forward'
""")
sh(label : 'pkill_proc - kubectl.*port-forward',
script : """
-pkill --uid "$(uid -u)" --echo --full 'kubectl.*port-forward'
+pkill --uid "\$(id -u)" --echo --full 'kubectl.*port-forward'
""")
sh(label : 'pgrep_proc - kill-post',
script : """
-pgrep --uid "$(uid -u)" --list-full --full 'kubectl.*port-forward'
+pgrep --uid "\$(id -u)" --list-full --full 'kubectl.*port-forward'
""")
leave('Cleanup')
@@ -284,17 +284,17 @@
sh(label : 'pgrep_proc - kill-pre',
script : """
-pgrep --uid "$(uid -u)" --list-full --full '_TAG=kail-startup'
+pgrep --uid "\$(id -u)" --list-full --full '_TAG=kail-startup'
""")
sh(label : 'pkill_proc - _TAG=kail-startup',
script : """
-pkill --uid "$(uid -u)" --echo --full '_TAG=kail-startup'
+pkill --uid "\$(id -u)" --echo --full '_TAG=kail-startup'
""")
sh(label : 'pgrep_proc - kill-post',
script : """
-pgrep --uid "$(uid -u)" --list-full --full '_TAG=kail-startup'
+pgrep --uid "\$(id -u)" --list-full --full '_TAG=kail-startup'
""")
println("${iam}: LEAVE")
@@ -343,7 +343,7 @@
println("Display spawned ${proc}")
sh(label : 'pgrep_proc - check',
script : """
-pgrep --uid "$(uid -u)" --list-full --full "port-forward"
+pgrep --uid "\$(id -u)" --list-full --full "port-forward"
""")
leave('port-forward check')
}
@@ -483,16 +483,16 @@
*/
sh(label : 'pgrep_proc - kill-pre',
script : """
-pgrep --uid "$(uid -u)" --list-full --full "kail-startup',
+pgrep --uid "\$(id -u)" --list-full --full "kail-startup',
""")
sh(label : 'pkill_proc - kail',
script : """
-pkill --uid "$(uid -u)" --echo --full 'kail'
+pkill --uid "\$(id -u)" --echo --full 'kail'
""")
sh(label : 'pgrep_proc - kill-post',
script : """
-pgrep --uid "$(uid -u)" --list-full --full 'kail'
+pgrep --uid "\$(id -u)" --list-full --full 'kail'
""")
println("${iam}: LEAVE")
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index 389d428..f0ec678 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -140,17 +140,17 @@
sh(label : 'pgrep_proc - kill-pre',
script : """
-pgrep --uid "$(uid -u)" --list-full --full 'kubectl.*port-forward'
+pgrep --uid "\$(id -u)" --list-full --full 'kubectl.*port-forward'
""")
sh(label : 'pkill_proc - kubectl.*port-forward',
script : """
-pkill --uid "$(uid -u)" --echo --full 'kubectl.*port-forward'
+pkill --uid "\$(id -u)" --echo --full 'kubectl.*port-forward'
""")
sh(label : 'pgrep_proc - kill-post',
script : """
-pgrep --uid "$(uid -u)" --list-full --full 'kubectl.*port-forward'
+pgrep --uid "\$(id -u)" --list-full --full 'kubectl.*port-forward'
""")
leave('Cleanup')
@@ -284,17 +284,17 @@
sh(label : 'pgrep_proc - kill-pre',
script : """
-pgrep --uid "$(uid -u)" --list-full --full '_TAG=kail-startup'
+pgrep --uid "\$(id -u)" --list-full --full '_TAG=kail-startup'
""")
sh(label : 'pkill_proc - _TAG=kail-startup',
script : """
-pkill --uid "$(uid -u)" --echo --full '_TAG=kail-startup'
+pkill --uid "\$(id -u)" --echo --full '_TAG=kail-startup'
""")
sh(label : 'pgrep_proc - kill-post',
script : """
-pgrep --uid "$(uid -u)" --list-full --full '_TAG=kail-startup'
+pgrep --uid "\$(id -u)" --list-full --full '_TAG=kail-startup'
""")
println("${iam}: LEAVE")
@@ -343,7 +343,7 @@
println("Display spawned ${proc}")
sh(label : 'pgrep_proc - check',
script : """
-pgrep --uid "$(uid -u)" --list-full --full "port-forward"
+pgrep --uid "\$(id -u)" --list-full --full "port-forward"
""")
leave('port-forward check')
}
@@ -483,16 +483,16 @@
*/
sh(label : 'pgrep_proc - kill-pre',
script : """
-pgrep --uid "$(uid -u)" --list-full --full "kail-startup',
+pgrep --uid "\$(id -u)" --list-full --full "kail-startup',
""")
sh(label : 'pkill_proc - kail',
script : """
-pkill --uid "$(uid -u)" --echo --full 'kail'
+pkill --uid "\$(id -u)" --echo --full 'kail'
""")
sh(label : 'pgrep_proc - kill-post',
script : """
-pgrep --uid "$(uid -u)" --list-full --full 'kail'
+pgrep --uid "\$(id -u)" --list-full --full 'kail'
""")
println("${iam}: LEAVE")