Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove neutron_trunk from all Hunter jobs
[releng.git] / jjb / functest / functest.ovn.yaml
diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index be76f02..2dce177 100644 (file)
--- 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 \
-            --privileged=true \
             -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
@@ -329,20 +328,59 @@
       - tempest_scenario
       - tempest_slow
       - patrole
-      - neutron_trunk
+      - patrole_admin
+      - patrole_member
+      - patrole_reader
       - networking-bgpvpn
       - networking-sfc
-      - barbican
-      - octavia
+      - tempest_barbican
+      - tempest_octavia
+      - tempest_cyborg
     exclude:
       - tag: latest
         test: refstack_defcore
+      - tag: latest
+        test: networking-bgpvpn
+      - tag: latest
+        test: networking-sfc
+      - tag: latest
+        test: patrole
+      - tag: kali
+        test: refstack_defcore
+      - tag: kali
+        test: networking-bgpvpn
+      - tag: kali
+        test: networking-sfc
+      - tag: kali
+        test: patrole_admin
+      - tag: kali
+        test: patrole_member
+      - tag: kali
+        test: patrole_reader
       - tag: jerma
         test: refstack_defcore
+      - tag: jerma
+        test: networking-bgpvpn
+      - tag: jerma
+        test: networking-sfc
+      - tag: jerma
+        test: patrole_admin
+      - tag: jerma
+        test: patrole_member
+      - tag: jerma
+        test: patrole_reader
+      - tag: jerma
+        test: tempest_cyborg
       - tag: iruya
         test: refstack_defcore
       - tag: iruya
-        test: octavia
+        test: patrole_admin
+      - tag: iruya
+        test: patrole_member
+      - tag: iruya
+        test: patrole_reader
+      - tag: iruya
+        test: tempest_cyborg
       - tag: hunter
         test: refstack_compute
       - tag: hunter
@@ -350,7 +388,17 @@
       - tag: hunter
         test: refstack_platform
       - tag: hunter
-        test: octavia
+        test: tempest_octavia
+      - tag: hunter
+        test: tempest_telemetry
+      - tag: hunter
+        test: patrole_admin
+      - tag: hunter
+        test: patrole_member
+      - tag: hunter
+        test: patrole_reader
+      - tag: hunter
+        test: tempest_cyborg
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
 
@@ -359,9 +407,10 @@
     <<: *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
       - rally_sanity_cntt
       - tempest_full_cntt
       - tempest_scenario_cntt
@@ -496,7 +545,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
@@ -526,9 +574,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
@@ -536,6 +583,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'
@@ -554,26 +603,33 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_admin-run'
+              <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_member-run'
+              <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *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
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cyborg-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
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
@@ -584,7 +640,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
@@ -596,7 +651,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
@@ -604,8 +658,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
@@ -619,7 +671,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: dump all campaign data
-          condition: ALWAYS
           projects:
             - name: 'functest-ovn-{tag}-zip'
               <<: *functest-ovn-jobs
@@ -653,29 +704,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:
@@ -683,9 +734,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:
@@ -693,6 +744,7 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
     exclude:
       - tag: latest
+      - tag: kali
       - tag: jerma
 
 - project:
@@ -794,22 +846,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
@@ -861,7 +913,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
@@ -869,6 +921,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'
@@ -887,25 +941,33 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_admin-run'
+              <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_member-run'
+              <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *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}-tempest_octavia-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cyborg-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
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
@@ -934,7 +996,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
@@ -1010,22 +1071,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
@@ -1077,7 +1138,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
@@ -1085,6 +1146,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'
@@ -1103,25 +1166,33 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_admin-run'
+              <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_member-run'
+              <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *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
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cyborg-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
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
@@ -1150,7 +1221,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