Improve view filters

Change-Id: Ia738eca55a05533395e17a0fc9d8323e8d128f1e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 975bfa1..1f92660 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -997,7 +997,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-daily$
+    regex: ^functest-kubernetes-[a-z]+-daily$
 
 - view:
     name: functest-kubernetes-review
@@ -1009,7 +1009,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-review$
+    regex: ^functest-kubernetes-[a-z]+-review$
 
 - view:
     name: functest-kubernetes-tox
@@ -1021,7 +1021,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-tox$
+    regex: ^functest-kubernetes-[a-z]+-tox$
 
 - view:
     name: functest-kubernetes-docker
@@ -1033,7 +1033,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-docker$
+    regex: ^functest-kubernetes-[a-z]+-docker$
 
 - view:
     name: functest-kubernetes-trivy
@@ -1045,4 +1045,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-trivy$
+    regex: ^functest-kubernetes-[a-z]+-trivy$

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 2ab0809..0768bd0 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1315,7 +1315,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z-]+-daily$
+    regex: ^functest-[a-z]+-daily$
 
 - view:
     name: functest-review
@@ -1327,7 +1327,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z-]+-review$
+    regex: ^functest-[a-z]+-review$
 
 - view:
     name: functest-tox
@@ -1339,7 +1339,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z-]+-tox$
+    regex: ^functest-[a-z]+-tox$
 
 - view:
     name: functest-docker
@@ -1351,7 +1351,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z-]+-docker$
+    regex: ^functest-[a-z]+-docker$
 
 - view:
     name: functest-trivy
@@ -1363,4 +1363,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z-]+-trivy$
+    regex: ^functest-[a-z]+-trivy$

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 1c12a1a..87290ca 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -702,7 +702,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-]+-daily$
+    regex: ^xtesting-[a-z]+-daily$
 
 - view:
     name: xtesting-review
@@ -714,7 +714,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-]+-review$
+    regex: ^xtesting-[a-z]+-review$
 
 - view:
     name: xtesting-tox
@@ -726,7 +726,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-]+-tox$
+    regex: ^xtesting-[a-z]+-tox$
 
 - view:
     name: xtesting-docker
@@ -738,7 +738,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-]+-docker$
+    regex: ^xtesting-[a-z]+-docker$
 
 - view:
     name: xtesting-trivy
@@ -750,4 +750,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-]+-trivy$
+    regex: ^xtesting-[a-z]+-trivy$