X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=a67051ae052b582cbf1ae9077887cd44583e1921;hb=a3bd7f544347cdd2c4811768bb7232a4b299bbce;hp=d24ee120b726e2255a7222a44412343fd1ba2b00;hpb=cd667ba9cbc52aa2476bd5379f4a3039683c2f67;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index d24ee120b..a67051ae0 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,6 +10,8 @@
     tag:
       - latest:
           branch: master
+      - hunter:
+          branch: stable/hunter
 
 - parameter:
     name: functest-slave
@@ -158,13 +160,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
-- project:
-    name: 'functest-opnfv-functest-components-pull'
-    <<: *functest-params
-    container: 'functest-components'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
-
 - project:
     name: 'functest-opnfv-functest-vnf-pull'
     <<: *functest-params
@@ -208,13 +203,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
-- project:
-    name: 'functest-opnfv-functest-components-rmi'
-    <<: *functest-params
-    container: 'functest-components'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
-
 - project:
     name: 'functest-opnfv-functest-vnf-rmi'
     <<: *functest-params
@@ -255,6 +243,7 @@
       - odl
       - api_check
       - snaps_health_check
+      - tempest_smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -263,11 +252,11 @@
     <<: *functest-params
     container: 'functest-smoke'
     test:
-      - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
-      - rally_jobs
       - refstack_defcore
+      - tempest_full
+      - tempest_scenario
       - patrole
       - snaps_smoke
       - neutron_trunk
@@ -282,22 +271,13 @@
     <<: *functest-params
     container: 'functest-benchmarking'
     test:
+      - rally_full
+      - rally_jobs
       - vmtp
       - shaker
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
-- project:
-    name: 'functest-opnfv-functest-components'
-    <<: *functest-params
-    container: 'functest-components'
-    test:
-      - tempest_full
-      - tempest_scenario
-      - rally_full
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
 - project:
     name: 'functest-opnfv-functest-vnf'
     <<: *functest-params
@@ -348,8 +328,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -363,8 +341,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-pull'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-pull'
@@ -398,19 +374,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
@@ -426,21 +404,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -562,16 +536,6 @@
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
 
-- project:
-    name: functest-opnfv-functest-components-{tag}-build
-    <<: *functest-params
-    container: functest-components
-    ref_arg:
-    path: docker/components
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
-
 - project:
     name: functest-opnfv-functest-vnf-{tag}-build
     <<: *functest-params
@@ -615,8 +579,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -650,8 +612,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-check'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-check'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-check'
@@ -685,19 +645,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
@@ -713,21 +675,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -802,8 +760,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -837,8 +793,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-gate'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-gate'
@@ -872,19 +826,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
@@ -900,21 +856,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs