X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=ce7f990030a9f0fc04473966ace60b4bf132a83e;hb=e1f021c2d45e25e1ab13637f410d325f934bcd15;hp=25a3d1ee8b79191356efb54aecd41d8b5f30058a;hpb=ea2f52db7d79dc3d9c256ee5891b4f34cb06eb32;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 25a3d1ee8..ce7f99003 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -14,8 +14,8 @@
           dashboard_url: http://172.30.13.94
       - jerma:
           branch: stable/jerma
-          slave: lf-virtual4
-          dashboard_url: http://172.30.13.89
+          slave: lf-pod4
+          dashboard_url: http://172.30.12.83
       - iruya:
           branch: stable/iruya
           slave: lf-virtual4
@@ -147,6 +147,8 @@
             -e DEBUG=$DEBUG \
             -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
             -e DASHBOARD_URL={dashboard_url} \
+            -e VOLUME_DEVICE_NAME=sdb \
+            -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/\
@@ -215,6 +217,13 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-opnfv-functest-benchmarking-cntt-pull'
+    <<: *functest-params
+    container: 'functest-benchmarking-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'functest-opnfv-functest-vnf-pull'
     <<: *functest-params
@@ -259,6 +268,13 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'functest-opnfv-functest-benchmarking-cntt-rmi'
+    <<: *functest-params
+    container: 'functest-benchmarking-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'functest-opnfv-functest-vnf-rmi'
     <<: *functest-params
@@ -352,13 +368,13 @@
     <<: *functest-params
     container: 'functest-smoke-cntt'
     test:
-      - neutron-tempest-plugin-api
-      - tempest_cinder
-      - tempest_keystone
-      - rally_sanity
-      - tempest_full
-      - tempest_scenario
-      - tempest_slow
+      - neutron-tempest-plugin-api-cntt
+      - tempest_cinder_cntt
+      - tempest_keystone_cntt
+      - rally_sanity_cntt
+      - tempest_full_cntt
+      - tempest_scenario_cntt
+      - tempest_slow_cntt
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -374,6 +390,16 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
+- project:
+    name: 'functest-opnfv-functest-benchmarking-cntt'
+    <<: *functest-params
+    container: 'functest-benchmarking-cntt'
+    test:
+      - rally_full_cntt
+      - rally_jobs_cntt
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-{test}-run'
+
 - project:
     name: 'functest-opnfv-functest-vnf'
     <<: *functest-params
@@ -458,6 +484,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
       - multijob:
@@ -471,6 +499,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-pull'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-jobs
       - multijob:
@@ -504,6 +534,7 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -541,20 +572,21 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
@@ -567,6 +599,13 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-benchmarking-cntt:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
@@ -616,21 +655,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.10-rmi'
+    name: 'functest-_-alpine-3.11-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.10'
+    tag: '3.11'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.10-pull'
+    name: 'functest-_-alpine-3.11-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.10'
+    tag: '3.11'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
@@ -688,6 +727,16 @@
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
 
+- project:
+    name: functest-opnfv-functest-benchmarking-cntt-{tag}-build
+    <<: *functest-params
+    container: functest-benchmarking-cntt
+    ref_arg: BRANCH
+    path: docker/benchmarking-cntt
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-{repo}-{container}-{tag}-check'
+
 - project:
     name: functest-opnfv-functest-vnf-{tag}-build
     <<: *functest-params
@@ -740,17 +789,19 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-rmi'
+            - name: 'functest-_-alpine-3.11-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-pull'
+            - name: 'functest-_-alpine-3.11-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -774,10 +825,12 @@
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
       - multijob:
-          name: build opnfv/functest-smoke-cntt
+          name: build cntt containers
           projects:
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-check'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-check'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -809,6 +862,7 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -846,20 +900,21 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
@@ -872,6 +927,13 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-benchmarking-cntt:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
@@ -943,17 +1005,19 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-rmi'
+            - name: 'functest-_-alpine-3.11-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-pull'
+            - name: 'functest-_-alpine-3.11-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -977,10 +1041,12 @@
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
       - multijob:
-          name: build opnfv/functest-smoke-cntt
+          name: build cntt containers
           projects:
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-gate'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -1012,6 +1078,7 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -1049,20 +1116,21 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
@@ -1075,6 +1143,13 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-benchmarking-cntt:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
@@ -1108,4 +1183,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z]+-(daily|check|gate)$
+    regex: ^functest(-ovn)?-[a-z]+-(daily|check|gate)$