VOL-5155 - triage failure in periodic-voltha-test-bbsim-2.12
jjb/pipeline/voltha/master/bbsim-tests.groovy
jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
--------------------------------------------------
o Declare a local var for the Exception msg iam string.
o No local var definition will result in call vars/getIam.groovy
which mangles the string '** iam@4d684d2c' as the script address.
vars/pgrep_proc.groovy
vars/pkill_proc.groovy
----------------------
o Fix boolean constant [fF]alse.
Change-Id: I989b5238926801af9417fee51424af79d7789c7d
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index ae5c58a..4530de8 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -642,8 +642,10 @@
enter("execute_test (target=$target)")
execute_test(target, workflow, testLogging, teardown, flags)
}
+ // groovylint-disable-next-line CatchException
catch (Exception err) {
- println("** ${iam}: EXCEPTION ${err}")
+ String iamexc = getIam(name)
+ println("** ${iamexc}: EXCEPTION ${err}")
}
finally {
leave("execute_test (target=$target)")
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index 522d7f7..3909c4e 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -637,13 +637,14 @@
** Executing test ${target} on workflow ${workflow} with logging ${testLogging} and extra flags ${flags}
** -----------------------------------------------------------------------
""")
-
try {
enter("execute_test (target=$target)")
execute_test(target, workflow, testLogging, teardown, flags)
}
+ // groovylint-disable-next-line CatchException
catch (Exception err) {
- println("** ${iam}: EXCEPTION ${err}")
+ String iamexc = getIam(name)
+ println("** ${iamexc}: EXCEPTION ${err}")
}
finally {
leave("execute_test (target=$target)")
diff --git a/vars/pgrep_proc.groovy b/vars/pgrep_proc.groovy
index a1d49e5..ca3ab0b 100644
--- a/vars/pgrep_proc.groovy
+++ b/vars/pgrep_proc.groovy
@@ -77,7 +77,7 @@
process(proc, args)
}
catch (Exception err) { // groovylint-disable-line CatchException
- ans = False
+ ans = false
println("** ${iam}: EXCEPTION ${err}")
throw err
}
diff --git a/vars/pkill_proc.groovy b/vars/pkill_proc.groovy
index 2ac7bde..398444a 100644
--- a/vars/pkill_proc.groovy
+++ b/vars/pkill_proc.groovy
@@ -93,7 +93,7 @@
process(proc, args)
}
catch (Exception err) { // groovylint-disable-line CatchException
- ans = False
+ ans = false
println("** ${iam}: EXCEPTION ${err}")
throw err
}