Adjust rules and add quotes around path
Change-Id: Ifca8d2f12010b0365d0a8f237609977d2610eb60
diff --git a/jobs.yaml b/jobs.yaml
index 2a0a1b3..52dfbbb 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -56,7 +56,7 @@
- shell: "echo $dir; ~mininet/mininet/util/vm/build.py -v --test core --image $dir/*/*.vmdk"
publishers:
- logparser:
- parse-rules: /home/mininet/vm-build/mininet-test.rules
+ parse-rules: "/home/mininet/vm-build/mininet-test.rules"
unstable-on-warning: false
fail-on-error: true
diff --git a/mininet-test.rules b/mininet-test.rules
index cea54c8..6de5b18 100644
--- a/mininet-test.rules
+++ b/mininet-test.rules
@@ -1,16 +1,20 @@
# Rules for Jenkins Log Parser Plugin
# These should work for parsing the Mininet test log
+# Rules are in priority order - first matching rule
+# triggers and the rest are ignored.
-# Passed tests should be marked with OK
-ok /OK/
+# Failed full tests will be marked with FAILED
+error /FAILED/
# Print warnings for specific sub-errors
warn /(?i)^exception/
warn /ERROR/
-# Failed full tests will be marked with FAILED
-error /FAILED/
+# Passed tests should be marked with OK
+ok /Test.*OK/
-# Start of various sections
-start /(?i)booting/
-start /(?i)running tests/
+# Useful information
+info /(?i)booting/
+info /(?i)running tests/
+info /Ran.*tests in/
+