X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=fc0718a9ce71eb32614869ac3146b02b921048a3;hb=f7df2d437f5b4b15d3c374da4d24b137cc672916;hp=c92e70d94c33e26d7b671d834bf8aafdd97d86d7;hpb=a78697d4c2304ee4dcc56f3d8580a02d27dc00e1;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index c92e70d94..fc0718a9c 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -11,6 +11,9 @@
       - latest:
           branch: master
           slave: lf-virtual9
+      - jerma:
+          branch: stable/jerma
+          slave: lf-virtual4
       - iruya:
           branch: stable/iruya
           slave: lf-virtual4
@@ -100,6 +103,10 @@
             image={repo}:{port}/{container}:{tag}
           fi
           if [ "{tag}" = "latest" ]; then
+            py=3.7
+          elif [ "{tag}" = "jerma" ]; then
+            py=3.7
+          elif [ "{tag}" = "iruya" ]; then
             py=3.6
           else
             py=2.7
@@ -110,6 +117,9 @@
             -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/python$py/\
+          site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\
+          blacklist.yaml \
             -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\
           site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
             $image run_tests -t {test}
@@ -181,13 +191,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
-- project:
-    name: 'functest-opnfv-functest-features-pull'
-    <<: *functest-params
-    container: 'functest-features'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
-
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-rmi'
     parameters:
@@ -225,13 +228,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
-- project:
-    name: 'functest-opnfv-functest-features-rmi'
-    <<: *functest-params
-    container: 'functest-features'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
-
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-{test}-run'
     parameters:
@@ -274,22 +270,32 @@
       - refstack_platform
       - tempest_full
       - tempest_scenario
+      - tempest_slow
       - patrole
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
       - barbican
+      - octavia
     exclude:
       - tag: latest
         test: refstack_defcore
+      - tag: jerma
+        test: refstack_defcore
       - tag: iruya
         test: refstack_defcore
+      - tag: iruya
+        test: octavia
       - tag: hunter
         test: refstack_compute
       - tag: hunter
         test: refstack_object
       - tag: hunter
         test: refstack_platform
+      - tag: hunter
+        test: tempest_slow
+      - tag: hunter
+        test: octavia
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -318,19 +324,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
-- project:
-    name: 'functest-opnfv-functest-features'
-    <<: *functest-params
-    container: 'functest-features'
-    test:
-      - doctor-notification
-      - functest-odl-sfc
-      - barometercollectd
-      - vgpu
-      - stor4nfv_os
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
 - job-template:
     name: 'functest-{tag}-daily'
     project-type: multijob
@@ -357,8 +350,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: pull containers
           projects:
@@ -370,12 +361,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-pull'
-              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-jobs
@@ -403,8 +390,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
-          execution-type: PARALLEL
-          condition: SUCCESSFUL
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -422,6 +407,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
@@ -432,10 +419,10 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
@@ -448,7 +435,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -460,21 +446,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
@@ -505,21 +476,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.9-rmi'
+    name: 'functest-_-alpine-3.10-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: '3.10'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.9-pull'
+    name: 'functest-_-alpine-3.10-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: '3.10'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
@@ -543,6 +514,9 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
+    exclude:
+      - tag: latest
+      - tag: jerma
 
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
@@ -584,16 +558,6 @@
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
 
-- project:
-    name: functest-opnfv-functest-features-{tag}-build
-    <<: *functest-params
-    container: functest-features
-    ref_arg: BRANCH
-    path: docker/features
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
-
 - job-template:
     name: 'functest-{tag}-check'
     project-type: multijob
@@ -620,17 +584,15 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-rmi'
+            - name: 'functest-_-alpine-3.10-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-pull'
+            - name: 'functest-_-alpine-3.10-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -653,12 +615,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-check'
-              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-jobs
@@ -686,8 +644,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
-          execution-type: PARALLEL
-          condition: SUCCESSFUL
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -705,6 +661,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
@@ -715,10 +673,10 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
@@ -731,7 +689,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -743,21 +700,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - trigger:
     name: functest-patchset-created
@@ -809,17 +751,15 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-rmi'
+            - name: 'functest-_-alpine-3.10-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-pull'
+            - name: 'functest-_-alpine-3.10-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -842,12 +782,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-gate'
-              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-jobs
@@ -875,8 +811,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
-          execution-type: PARALLEL
-          condition: SUCCESSFUL
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -894,6 +828,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
@@ -904,10 +840,10 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
@@ -920,7 +856,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -932,21 +867,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - project:
     name: 'functest'