X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=feb574732cf7aa36249758bc4d75693e7196dc6d;hb=c6f55934877797facb11dc79c684a9fc37ebeeba;hp=6ff1f3044d40399a5fc8560ccdbaa98ddd789c7b;hpb=20cb2c4f270cbfacffacc56de1642d8762a00cf7;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 6ff1f3044..feb574732 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}'
@@ -797,6 +815,21 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
 
+- project:
+    name: functest-opnfv-functest-tempest-{tag}-gate
+    <<: *functest-params
+    container: functest-tempest
+    ref_arg: BRANCH
+    path: docker/tempest
+    exclude:
+      - {'tag': 'latest'}
+      - {'tag': 'leguer'}
+      - {'tag': 'kali'}
+      - {'tag': 'jerma'}
+      - {'tag': 'iruya'}
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-gate'
+
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-gate
     <<: *functest-params
@@ -936,6 +969,11 @@
           projects:
             - name: 'functest-opnfv-functest-core-{tag}-gate'
               <<: *functest-jobs
+      - multijob:
+          name: build opnfv/functest-tempest
+          projects:
+            - name: 'functest-opnfv-functest-tempest-{tag}-gate'
+              <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
@@ -1081,6 +1119,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:
@@ -1126,6 +1194,21 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-build'
 
+- project:
+    name: functest-opnfv-functest-tempest-{tag}-build
+    <<: *functest-params
+    container: functest-tempest
+    ref_arg: BRANCH
+    path: docker/tempest
+    exclude:
+      - {'tag': 'latest'}
+      - {'tag': 'leguer'}
+      - {'tag': 'kali'}
+      - {'tag': 'jerma'}
+      - {'tag': 'iruya'}
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
     <<: *functest-params
@@ -1214,6 +1297,11 @@
           projects:
             - name: 'functest-opnfv-functest-core-{tag}-build'
               <<: *functest-jobs
+      - multijob:
+          name: build opnfv/functest-tempest
+          projects:
+            - name: 'functest-opnfv-functest-tempest-{tag}-build'
+              <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
@@ -1237,7 +1325,7 @@
     name: functest-trivy
     builders:
       - shell: |
-          sudo apt-get update && sudo apt-get install curl
+          sudo apt-get update && sudo apt-get install curl -y
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -1300,47 +1388,8 @@
     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-z]+-daily$
-
-- view:
-    name: functest-review
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^functest-[a-z]+-review$
-
-- view:
-    name: functest-tox
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^functest-[a-z]+-tox$
-
 - view:
     name: functest-docker
     view-type: list
@@ -1351,7 +1400,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z]+-docker$
+    regex: ^functest-[a-z0-9]+-docker$
 
 - view:
     name: functest-trivy
@@ -1363,4 +1412,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z-]+-trivy$
+    regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9]+-trivy$