X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=2647581f9b04722d6c84913f695215bbc254433a;hb=86a13b92466be1a188adb5769f0f35a85e0d61ed;hp=8d7e7d7728eee1e24f7441ed9494f921b31d9127;hpb=2b931c4576d45848ea8d231dd5a4dd1fffd9ba88;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 8d7e7d772..2647581f9 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -12,6 +12,10 @@
           branch: master
           slave: lf-virtual9
           dashboard_url: http://172.30.13.94
+      - kali:
+          branch: stable/kali
+          slave: lf-pod4-3
+          dashboard_url: http://172.30.12.88
       - jerma:
           branch: stable/jerma
           slave: lf-pod4
@@ -127,15 +131,6 @@
           else
             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
-          fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -151,9 +146,6 @@
             -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_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
 
@@ -315,9 +307,6 @@
       - odl
       - tempest_smoke
       - tempest_horizon
-    exclude:
-      - tag: hunter
-        test: tempest_horizon
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -326,10 +315,11 @@
     <<: *functest-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
@@ -342,23 +332,37 @@
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
-      - barbican
-      - octavia
+      - tempest_barbican
+      - tempest_octavia
     exclude:
-      - tag: jerma
-        test: tempest_heat
-      - tag: iruya
-        test: tempest_heat
-      - tag: hunter
-        test: tempest_heat
       - 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
@@ -366,7 +370,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-{repo}-{container}-{tag}-{test}-run'
 
@@ -375,9 +383,10 @@
     <<: *functest-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
@@ -425,7 +434,7 @@
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -542,7 +551,7 @@
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-jobs
@@ -550,6 +559,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -574,19 +585,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
@@ -615,7 +628,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -662,21 +674,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.11-rmi'
+    name: 'functest-_-alpine-3.12-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.11'
+    tag: '3.12'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.11-pull'
+    name: 'functest-_-alpine-3.12-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.11'
+    tag: '3.12'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
@@ -702,6 +714,7 @@
       - 'functest-{repo}-{container}-{tag}-check'
     exclude:
       - tag: latest
+      - tag: kali
       - tag: jerma
 
 - project:
@@ -803,12 +816,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.11-rmi'
+            - name: 'functest-_-alpine-3.12-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.11-pull'
+            - name: 'functest-_-alpine-3.12-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -870,7 +883,7 @@
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-jobs
@@ -878,6 +891,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -902,19 +917,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
@@ -943,7 +960,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -1019,12 +1035,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.11-rmi'
+            - name: 'functest-_-alpine-3.12-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.11-pull'
+            - name: 'functest-_-alpine-3.12-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -1086,7 +1102,7 @@
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-jobs
@@ -1094,6 +1110,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -1118,19 +1136,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
@@ -1159,7 +1179,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -1190,4 +1209,16 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest(-ovn)?-[a-z]+-(daily|check|gate)$
+    regex: ^functest(-ovn)?-[a-z]+-daily$
+
+- view:
+    name: functest-gate
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest(-ovn)?-[a-z]+-gate$