Fixed a quoting problem
Change-Id: I10c0b529613f6ffd1e870a090a8cccddf9d153f1
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 1dd57f5..e36c85b 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -44,7 +44,7 @@
// per-script to be sure latest repository changes are being used.
// -----------------------------------------------------------------------
String pipelineVer() {
- String version = 'e9725b199be034061750c6e9c4c3ac46cf2d0f68'
+ String version = '45c11f80698d3be1416a86d2872d6e25aa24baa8'
return(version)
}
@@ -502,12 +502,6 @@
pkill --uid "\$(id -u)" --echo --full 'kail'
fi
""")
-
- sh(label : 'pgrep_proc - kill-post',
- script : """
-pgrep --uid "\$(id -u)" --list-full --full 'kail || true
-""")
-
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 4491bb7..b3105c3 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -43,8 +43,8 @@
// regenerated. Hardcode a version string that can be assigned
// per-script to be sure latest repository changes are being used.
// -----------------------------------------------------------------------
-String pipelineVer() {
- String version = 'e9725b199be034061750c6e9c4c3ac46cf2d0f68'
+String pipelineVer() {
+ String version = '45c11f80698d3be1416a86d2872d6e25aa24baa8'
return(version)
}
@@ -131,8 +131,10 @@
enter('Cleanup')
// remove orphaned port-forward from different namespaces
- String proc = 'kubectl.*port-forward' // was 'port-forw'
- /*
+ // String proc = 'kubectl.*port-forward' // was 'port-forw'
+
+ /* Pass Gstring args to sh() having problems
+ implicit cast from GString to java.lang.String unsupported
pgrep_proc(proc)
pkill_proc(proc)
pgrep_proc(proc) // todo: fatal unless (proc count==0)
@@ -502,12 +504,6 @@
pkill --uid "\$(id -u)" --echo --full 'kail'
fi
""")
-
- sh(label : 'pgrep_proc - kill-post',
- script : """
-pgrep --uid "\$(id -u)" --list-full --full 'kail || true
-""")
-
println("${iam}: LEAVE")
}
diff --git a/vars/pgrep_proc.groovy b/vars/pgrep_proc.groovy
index 9629de4..2ecdda9 100644
--- a/vars/pgrep_proc.groovy
+++ b/vars/pgrep_proc.groovy
@@ -71,6 +71,8 @@
String iam = getIam('main')
Boolean ans = true
+ throw new Exception("UNUSED: Not yet implemented")
+
println("** ${iam}: ENTER")
// var = Gstring throws exception due to cast problem.
diff --git a/vars/pkill_proc.groovy b/vars/pkill_proc.groovy
index 56a1d9b..2bf2b1d 100644
--- a/vars/pkill_proc.groovy
+++ b/vars/pkill_proc.groovy
@@ -87,7 +87,7 @@
// var = Gstring throws exception due to cast problem.
// var = [ 'foo', 'bar' 'tans' ].join(' ').toString() fails
- throw new Exception("Not yet implemented")
+ throw new Exception("UNUSED: Not yet implemented")
try {
// Limit process matching by default