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

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 318549e85..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
@@ -140,18 +140,22 @@
             -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 \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$slave \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -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/\
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\
           blacklist.yaml \
             -v /home/opnfv/functest/.boto:/root/.boto \
-            $image run_tests -t {test} -p
+            $image run_tests -t {test} -r -p
 
 - builder:
     name: functest-remove-images
@@ -213,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
@@ -257,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
@@ -350,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'
 
@@ -372,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
@@ -385,6 +413,45 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
+- builder:
+    name: functest-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/functest \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'functest-{tag}-zip'
+    parameters:
+      - functest-build_tag:
+          build_tag: ''
+    builders:
+      - functest-zip:
+          <<: *functest-containers
+
+- project:
+    name: 'functest-{tag}-zip'
+    <<: *functest-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'functest-{tag}-zip'
+
 - job-template:
     name: 'functest-{tag}-daily'
     project-type: multijob
@@ -417,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:
@@ -430,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:
@@ -463,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
@@ -500,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}
@@ -526,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
@@ -540,6 +620,11 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'functest-{tag}-zip'
+              <<: *functest-jobs
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
@@ -570,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'
@@ -642,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
@@ -694,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
@@ -728,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:
@@ -763,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
@@ -800,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}
@@ -826,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
@@ -897,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
@@ -931,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:
@@ -966,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
@@ -1003,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}
@@ -1029,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
@@ -1062,4 +1183,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z]+-(daily|check|gate)$
+    regex: ^functest(-ovn)?-[a-z]+-(daily|check|gate)$