X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=29fd156a1eece3dcd534cadeee7b436c73e5dede;hb=3e932f8d950437966560349052f1b6b91d891902;hp=544021bc87c27dc85661b5bb4d7a75a40b5d6678;hpb=2de8ea9fa5a9083133a6c4067391291732781989;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 544021bc8..29fd156a1 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
@@ -97,9 +99,6 @@
             -e EXTERNAL_NETWORK=public \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
-            -v /home/opnfv/functest/tempest_blacklist.yaml:\
-          /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
-          tempest/custom_tests/blacklist.yaml \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
@@ -161,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
@@ -211,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
@@ -256,8 +241,7 @@
       - vping_userdata
       - cinder_test
       - odl
-      - api_check
-      - snaps_health_check
+      - tempest_smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -266,13 +250,12 @@
     <<: *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
       - networking-bgpvpn
       - networking-sfc
@@ -285,22 +268,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
@@ -320,7 +294,6 @@
     container: 'functest-features'
     test:
       - doctor-notification
-      - bgpvpn
       - functest-odl-sfc
       - barometercollectd
       - vgpu
@@ -340,7 +313,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -351,8 +324,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'
@@ -366,8 +337,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'
@@ -397,26 +366,22 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - 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}-patrole-run'
+            - 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}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -429,21 +394,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-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
@@ -460,8 +421,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
@@ -498,20 +457,20 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.8-rmi'
+    name: 'functest-_-alpine-3.9-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.8-pull'
+    name: 'functest-_-alpine-3.9-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
@@ -565,16 +524,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
@@ -607,7 +556,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -618,8 +567,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'
@@ -627,12 +574,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -653,8 +600,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'
@@ -684,26 +629,22 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - 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}-patrole-run'
+            - 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}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -716,21 +657,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
@@ -747,8 +684,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
@@ -794,7 +729,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -805,8 +740,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'
@@ -814,12 +747,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -840,8 +773,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'
@@ -871,26 +802,22 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - 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}-patrole-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
+            - 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}-neutron_trunk-run'
               <<: *functest-jobs
@@ -903,21 +830,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-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
@@ -934,8 +857,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'