summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-02-13 16:58:06 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2021-02-13 16:58:06 +0100
commitaed609f5e573eaf4572512267fd03c3bf4cab277 (patch)
tree150d45388e1dcd8520cc5affe01481295b9fabd7 /jjb
parentaa4722a1d16999ee50807da2f9d5866d5d863bd5 (diff)
Manage view filters by XtestingCI
Change-Id: I8823190d7e72850690bdd8945f726466cc4dc956 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml4
-rw-r--r--jjb/functest/functest-kubernetes.yaml88
-rw-r--r--jjb/functest/functest-pi.yaml4
-rw-r--r--jjb/functest/functest.yaml88
-rw-r--r--jjb/functest/xtesting-pi.yaml4
-rw-r--r--jjb/functest/xtesting.yaml88
6 files changed, 153 insertions, 123 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index bcd6fde81..01ed2aad5 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -507,7 +507,7 @@
<<: *functest-kubernetes-pi-jobs
- project:
- name: 'functest-kubernetes-pi'
+ name: 'functest-kubernetes-pi-daily'
<<: *functest-kubernetes-pi-params
jobs:
- 'functest-kubernetes-pi-{tag}-daily'
@@ -522,4 +522,4 @@
- last-success
- last-failure
- last-duration
- regex: ^functest-kubernetes-pi-[a-z-0-9]+-daily$
+ regex: ^functest-kubernetes-pi-[a-z0-9]+-daily$
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 5c61e45f8..ffd3cf7be 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -482,6 +482,24 @@
- name: 'functest-kubernetes-{tag}-zip'
<<: *functest-kubernetes-jobs
+- project:
+ name: 'functest-kubernetes-daily'
+ <<: *functest-kubernetes-params
+ jobs:
+ - 'functest-kubernetes-{tag}-daily'
+
+- view:
+ name: functest-kubernetes
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-[a-z0-9]+-daily$
+
- functest-kubernetes-dep: &functest-kubernetes-dep
name: 'functest-kubernetes-containers'
repo: '{repo}'
@@ -777,6 +795,36 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
<<: *functest-kubernetes-jobs
+- project:
+ name: 'functest-kubernetes-review'
+ <<: *functest-kubernetes-params
+ jobs:
+ - 'functest-kubernetes-{tag}-review'
+
+- view:
+ name: functest-kubernetes-review
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-[a-z0-9]+-review$
+
+- view:
+ name: functest-kubernetes-tox
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-kubernetes-[a-z0-9]+-tox$
+
- builder:
name: functest-kubernetes-push-containers
builders:
@@ -982,47 +1030,9 @@
name: 'functest-kubernetes'
<<: *functest-kubernetes-params
jobs:
- - 'functest-kubernetes-{tag}-daily'
- - 'functest-kubernetes-{tag}-review'
- 'functest-kubernetes-{tag}-docker'
- view:
- name: functest-kubernetes
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-kubernetes-[a-z0-9]+-daily$
-
-- view:
- name: functest-kubernetes-review
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-kubernetes-[a-z0-9]+-review$
-
-- view:
- name: functest-kubernetes-tox
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-kubernetes-[a-z0-9]+-tox$
-
-- view:
name: functest-kubernetes-docker
view-type: list
columns:
@@ -1044,4 +1054,4 @@
- last-success
- last-failure
- last-duration
- regex: ^functest-kubernetes-[a-z-0-9]+-trivy$
+ regex: (?!functest-kubernetes-pi)^functest-kubernetes-[a-z-0-9]+-trivy$
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 51f8df3bb..5409d2dfc 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -766,7 +766,7 @@
<<: *functest-pi-jobs
- project:
- name: 'functest-pi'
+ name: 'functest-pi-daily'
<<: *functest-pi-params
jobs:
- 'functest-pi-{tag}-daily'
@@ -781,4 +781,4 @@
- last-success
- last-failure
- last-duration
- regex: (?!functest-kubernetes)^functest-pi-[a-z-0-9]+-daily$
+ regex: ^functest-pi-[a-z0-9]+-daily$
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 967ce5d77..52b1fe9cc 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -689,6 +689,24 @@
- name: 'functest-{tag}-zip'
<<: *functest-jobs
+- project:
+ name: 'functest-daily'
+ <<: *functest-params
+ jobs:
+ - 'functest-{tag}-daily'
+
+- view:
+ name: functest
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-[a-z0-9]+-daily$
+
- functest-dep: &functest-dep
name: 'functest-containers'
repo: '{repo}'
@@ -1081,6 +1099,36 @@
- name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
<<: *functest-jobs
+- project:
+ name: 'functest-review'
+ <<: *functest-params
+ jobs:
+ - 'functest-{tag}-review'
+
+- view:
+ name: functest-review
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-[a-z0-9]+-review$
+
+- view:
+ name: functest-tox
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^functest-[a-z0-9]+-tox$
+
- builder:
name: functest-push-containers
builders:
@@ -1300,47 +1348,9 @@
name: 'functest'
<<: *functest-params
jobs:
- - 'functest-{tag}-daily'
- - 'functest-{tag}-review'
- 'functest-{tag}-docker'
- view:
- name: functest
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-[a-z0-9]+-daily$
-
-- view:
- name: functest-review
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-[a-z0-9]+-review$
-
-- view:
- name: functest-tox
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^functest-[a-z0-9]+-tox$
-
-- view:
name: functest-docker
view-type: list
columns:
@@ -1362,4 +1372,4 @@
- last-success
- last-failure
- last-duration
- regex: (?!functest-kubernetes)^functest-[a-z-0-9]+-trivy$
+ regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9]+-trivy$
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index e3830ec68..4d5d35773 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -331,7 +331,7 @@
<<: *xtesting-pi-jobs
- project:
- name: 'xtesting-pi'
+ name: 'xtesting-pi-daily'
<<: *xtesting-pi-params
jobs:
- 'xtesting-pi-{tag}-daily'
@@ -346,4 +346,4 @@
- last-success
- last-failure
- last-duration
- regex: ^xtesting-pi-[a-z-0-9]+-daily$
+ regex: ^xtesting-pi-[a-z0-9]+-daily$
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 5d2d9bed9..f96a5a8d1 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -336,6 +336,24 @@
- name: 'xtesting-{tag}-zip'
<<: *xtesting-jobs
+- project:
+ name: 'xtesting-daily'
+ <<: *xtesting-params
+ jobs:
+ - 'xtesting-{tag}-daily'
+
+- view:
+ name: xtesting
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^xtesting-[a-z0-9]+-daily$
+
- xtesting-dep: &xtesting-dep
name: 'xtesting-containers'
repo: '{repo}'
@@ -550,6 +568,36 @@
- name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
<<: *xtesting-jobs
+- project:
+ name: 'xtesting-review'
+ <<: *xtesting-params
+ jobs:
+ - 'xtesting-{tag}-review'
+
+- view:
+ name: xtesting-review
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^xtesting-[a-z0-9]+-review$
+
+- view:
+ name: xtesting-tox
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^xtesting-[a-z0-9]+-tox$
+
- builder:
name: xtesting-push-containers
builders:
@@ -687,47 +735,9 @@
name: 'xtesting'
<<: *xtesting-params
jobs:
- - 'xtesting-{tag}-daily'
- - 'xtesting-{tag}-review'
- 'xtesting-{tag}-docker'
- view:
- name: xtesting
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^xtesting-[a-z0-9]+-daily$
-
-- view:
- name: xtesting-review
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^xtesting-[a-z0-9]+-review$
-
-- view:
- name: xtesting-tox
- view-type: list
- columns:
- - status
- - weather
- - job
- - last-success
- - last-failure
- - last-duration
- regex: ^xtesting-[a-z0-9]+-tox$
-
-- view:
name: xtesting-docker
view-type: list
columns:
@@ -749,4 +759,4 @@
- last-success
- last-failure
- last-duration
- regex: ^xtesting-[a-z-0-9]+-trivy$
+ regex: (?!xtesting-pi)^xtesting-[a-z-0-9]+-trivy$