X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.ovn.yaml;h=96fa688fbe6045528622d076181ef70818de5383;hb=1aaa2a905d3ef944e56e05b9ea5975c0e6699b1d;hp=9f3fd90719d78d1981d68b1cb2ac2ff537a9edae;hpb=030c70f2cfefa8ccff9ffd9f575dd8cde855b626;p=releng.git

diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 9f3fd9071..96fa688fb 100644
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -117,6 +117,8 @@
           fi
           if [ "{tag}" = "latest" ]; then
             py=3.8
+          elif [ "{tag}" = "kali" ]; then
+            py=3.8
           elif [ "{tag}" = "jerma" ]; then
             py=3.7
           elif [ "{tag}" = "iruya" ]; then
@@ -125,7 +127,6 @@
             py=2.7
           fi
           sudo docker run --rm \
-            --security-opt seccomp=unconfined \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -141,12 +142,9 @@
             -e IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi \
             -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_conf.yaml:/usr/lib/python$py/\
-          site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\
+            -v /home/opnfv/functest/tempest_conf.yaml:/src/functest/\
+          functest/opnfv_tests/openstack/tempest/custom_tests/\
           tempest_conf.yaml \
-            -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/.boto:/root/.boto \
             $image run_tests -t {test} -r -p
 
@@ -316,10 +314,11 @@
     <<: *functest-ovn-params
     container: 'functest-smoke'
     test:
-      - neutron-tempest-plugin-api
+      - tempest_neutron
       - tempest_cinder
       - tempest_keystone
       - tempest_heat
+      - tempest_telemetry
       - rally_sanity
       - refstack_defcore
       - refstack_compute
@@ -332,17 +331,37 @@
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
-      - barbican
-      - octavia
+      - tempest_barbican
+      - tempest_octavia
     exclude:
       - tag: latest
         test: refstack_defcore
+      - tag: latest
+        test: neutron_trunk
+      - tag: latest
+        test: networking-bgpvpn
+      - tag: latest
+        test: networking-sfc
+      - tag: kali
+        test: refstack_defcore
+      - tag: kali
+        test: neutron_trunk
+      - tag: kali
+        test: networking-bgpvpn
+      - tag: kali
+        test: networking-sfc
       - tag: jerma
         test: refstack_defcore
+      - tag: jerma
+        test: neutron_trunk
+      - tag: jerma
+        test: networking-bgpvpn
+      - tag: jerma
+        test: networking-sfc
       - tag: iruya
         test: refstack_defcore
       - tag: iruya
-        test: octavia
+        test: neutron_trunk
       - tag: hunter
         test: refstack_compute
       - tag: hunter
@@ -350,7 +369,11 @@
       - tag: hunter
         test: refstack_platform
       - tag: hunter
-        test: octavia
+        test: tempest_octavia
+      - tag: hunter
+        test: neutron_trunk
+      - tag: hunter
+        test: tempest_telemetry
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
 
@@ -359,7 +382,7 @@
     <<: *functest-ovn-params
     container: 'functest-smoke-cntt'
     test:
-      - neutron-tempest-plugin-api-cntt
+      - tempest_neutron_cntt
       - tempest_cinder_cntt
       - tempest_keystone_cntt
       - tempest_heat_cntt
@@ -497,7 +520,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
-          condition: ALWAYS
           projects:
             - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-ovn-jobs
@@ -527,9 +549,8 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
-          condition: ALWAYS
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
@@ -537,6 +558,8 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -561,15 +584,14 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_octavia-run'
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
-          condition: ALWAYS
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-ovn-jobs
@@ -587,7 +609,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
-          condition: ALWAYS
           projects:
             - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-ovn-jobs
@@ -599,7 +620,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-benchmarking-cntt:{tag}
-          condition: ALWAYS
           projects:
             - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
               <<: *functest-ovn-jobs
@@ -607,8 +627,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          condition: ALWAYS
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs
@@ -622,7 +640,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: dump all campaign data
-          condition: ALWAYS
           projects:
             - name: 'functest-ovn-{tag}-zip'
               <<: *functest-ovn-jobs
@@ -656,29 +673,29 @@
           ref: $branch
 
 - project:
-    name: 'functest-ovn-_-alpine-3.11-rmi'
+    name: 'functest-ovn-_-alpine-3.12-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.11'
+    tag: '3.12'
     slave: master
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-ovn-_-alpine-3.11-pull'
+    name: 'functest-ovn-_-alpine-3.12-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.11'
+    tag: '3.12'
     slave: master
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-core-{tag}-build
+    name: functest-ovn-opnfv-functest-core-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-core
+    container: functest-core
     ref_arg: BRANCH
     path: docker/core
     jobs:
@@ -686,9 +703,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-tempest-{tag}-build
+    name: functest-ovn-opnfv-functest-tempest-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-tempest
+    container: functest-tempest
     ref_arg: BRANCH
     path: docker/tempest
     jobs:
@@ -696,6 +713,7 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
     exclude:
       - tag: latest
+      - tag: kali
       - tag: jerma
 
 - project:
@@ -797,22 +815,22 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-rmi'
+            - name: 'functest-ovn-_-alpine-3.12-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-pull'
+            - name: 'functest-ovn-_-alpine-3.12-pull'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-core
+          name: build opnfv/functest-core
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-core-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-core-{tag}-check'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-tempest
+          name: build opnfv/functest-tempest
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-tempest-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-tempest-{tag}-check'
               <<: *functest-ovn-jobs
       - multijob:
           name: build containers
@@ -864,7 +882,7 @@
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
@@ -872,6 +890,8 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -896,14 +916,14 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_octavia-run'
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-ovn-jobs
@@ -939,7 +959,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs
@@ -1015,22 +1034,22 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-rmi'
+            - name: 'functest-ovn-_-alpine-3.12-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-pull'
+            - name: 'functest-ovn-_-alpine-3.12-pull'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-core
+          name: build opnfv/functest-core
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-core-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-core-{tag}-gate'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-tempest
+          name: build opnfv/functest-tempest
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-tempest-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-tempest-{tag}-gate'
               <<: *functest-ovn-jobs
       - multijob:
           name: build containers
@@ -1082,7 +1101,7 @@
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
@@ -1090,6 +1109,8 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -1114,14 +1135,14 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_octavia-run'
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api_cntt-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-ovn-jobs
@@ -1157,7 +1178,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs