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

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index b856795e4..ce7f99003 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,13 +10,33 @@
     tag:
       - latest:
           branch: master
+          slave: lf-virtual9
+          dashboard_url: http://172.30.13.94
+      - jerma:
+          branch: stable/jerma
+          slave: lf-pod4
+          dashboard_url: http://172.30.12.83
+      - iruya:
+          branch: stable/iruya
+          slave: lf-virtual4
+          dashboard_url: http://172.30.13.89
+      - hunter:
+          branch: stable/hunter
+          slave: lf-virtual6
+          dashboard_url: http://172.30.13.91
 
 - parameter:
     name: functest-slave
     parameters:
       - label:
           name: slave
-          default: functest-virtual
+          default: '{slave}'
+
+- parameter:
+    name: functest-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
 
 - parameter:
     name: functest-branch
@@ -25,6 +45,20 @@
           name: branch
           default: '{branch}'
 
+- parameter:
+    name: functest-DEBUG
+    parameters:
+      - string:
+          name: DEBUG
+          default: 'true'
+
+- parameter:
+    name: functest-EXTERNAL_NETWORK
+    parameters:
+      - string:
+          name: EXTERNAL_NETWORK
+          default: public
+
 - functest-containers: &functest-containers
     name: 'functest-containers'
     repo: '{repo}'
@@ -33,9 +67,10 @@
     tag: '{tag}'
 
 - functest-run-containers: &functest-run-containers
-    name: 'functest-build-containers'
+    name: 'functest-run-containers'
     <<: *functest-containers
     test: '{test}'
+    dashboard_url: '{dashboard_url}'
 
 - functest-build-containers: &functest-build-containers
     name: 'functest-build-containers'
@@ -83,7 +118,7 @@
     name: functest-run-containers
     builders:
       - shell: |
-          set +ex
+          set +x
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -92,19 +127,35 @@
           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 \
+            -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 EXTERNAL_NETWORK=public \
+            -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 \
-            $image run_tests -t {test}
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            -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
 
 - builder:
     name: functest-remove-images
@@ -132,7 +183,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-pull-containers:
           <<: *functest-containers
@@ -152,37 +204,38 @@
       - 'functest-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-opnfv-functest-benchmarking-pull'
+    name: 'functest-opnfv-functest-smoke-cntt-pull'
     <<: *functest-params
-    container: 'functest-benchmarking'
+    container: 'functest-smoke-cntt'
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-opnfv-functest-components-pull'
+    name: 'functest-opnfv-functest-benchmarking-pull'
     <<: *functest-params
-    container: 'functest-components'
+    container: 'functest-benchmarking'
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-opnfv-functest-vnf-pull'
+    name: 'functest-opnfv-functest-benchmarking-cntt-pull'
     <<: *functest-params
-    container: 'functest-vnf'
+    container: 'functest-benchmarking-cntt'
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-opnfv-functest-features-pull'
+    name: 'functest-opnfv-functest-vnf-pull'
     <<: *functest-params
-    container: 'functest-features'
+    container: 'functest-vnf'
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-remove-images:
           <<: *functest-containers
@@ -202,37 +255,44 @@
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-opnfv-functest-benchmarking-rmi'
+    name: 'functest-opnfv-functest-smoke-cntt-rmi'
     <<: *functest-params
-    container: 'functest-benchmarking'
+    container: 'functest-smoke-cntt'
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-opnfv-functest-components-rmi'
+    name: 'functest-opnfv-functest-benchmarking-rmi'
     <<: *functest-params
-    container: 'functest-components'
+    container: 'functest-benchmarking'
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-opnfv-functest-vnf-rmi'
+    name: 'functest-opnfv-functest-benchmarking-cntt-rmi'
     <<: *functest-params
-    container: 'functest-vnf'
+    container: 'functest-benchmarking-cntt'
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-opnfv-functest-features-rmi'
+    name: 'functest-opnfv-functest-vnf-rmi'
     <<: *functest-params
-    container: 'functest-features'
+    container: 'functest-vnf'
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -253,8 +313,11 @@
       - vping_userdata
       - cinder_test
       - odl
-      - api_check
-      - snaps_health_check
+      - tempest_smoke
+      - tempest_horizon
+    exclude:
+      - tag: hunter
+        test: tempest_horizon
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -263,25 +326,55 @@
     <<: *functest-params
     container: 'functest-smoke'
     test:
-      - tempest_smoke
       - neutron-tempest-plugin-api
+      - tempest_cinder
+      - tempest_keystone
       - rally_sanity
       - refstack_defcore
+      - refstack_compute
+      - refstack_object
+      - refstack_platform
+      - tempest_full
+      - tempest_scenario
+      - tempest_slow
       - patrole
-      - snaps_smoke
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
       - barbican
+      - octavia
+    exclude:
+      - tag: latest
+        test: refstack_defcore
+      - tag: jerma
+        test: refstack_defcore
+      - tag: iruya
+        test: refstack_defcore
+      - tag: iruya
+        test: octavia
+      - tag: hunter
+        test: refstack_compute
+      - tag: hunter
+        test: refstack_object
+      - tag: hunter
+        test: refstack_platform
+      - tag: hunter
+        test: octavia
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-opnfv-functest-smoke-2'
+    name: 'functest-opnfv-functest-smoke-cntt'
     <<: *functest-params
-    container: 'functest-smoke'
+    container: 'functest-smoke-cntt'
     test:
-      - rally_jobs
+      - 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'
 
@@ -290,27 +383,20 @@
     <<: *functest-params
     container: 'functest-benchmarking'
     test:
+      - rally_full
+      - rally_jobs
       - vmtp
       - shaker
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-opnfv-functest-components'
+    name: 'functest-opnfv-functest-benchmarking-cntt'
     <<: *functest-params
-    container: 'functest-components'
+    container: 'functest-benchmarking-cntt'
     test:
-      - tempest_full
-      - tempest_scenario
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
-- project:
-    name: 'functest-opnfv-functest-components-2'
-    <<: *functest-params
-    container: 'functest-components'
-    test:
-      - rally_full
+      - rally_full_cntt
+      - rally_jobs_cntt
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -327,19 +413,44 @@
     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-opnfv-functest-features'
+    name: 'functest-{tag}-zip'
     <<: *functest-params
-    container: 'functest-features'
-    test:
-      - doctor-notification
-      - bgpvpn
-      - functest-odl-sfc
-      - barometercollectd
-      - vgpu
-      - stor4nfv_os
+    container: 'functest-healthcheck'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-{tag}-zip'
 
 - job-template:
     name: 'functest-{tag}-daily'
@@ -347,13 +458,20 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -362,14 +480,14 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: pull containers
           projects:
@@ -377,14 +495,14 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-pull'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-pull'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-pull'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-pull'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-pull'
-              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -410,24 +528,37 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -437,32 +568,47 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-smoke:{tag}
+          name: opnfv/functest-smoke-cntt:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-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_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_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'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-components:{tag}
+          name: opnfv/functest-benchmarking-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -475,25 +621,16 @@
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-features:{tag}
+          name: dump all campaign data
           projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
+            - name: 'functest-{tag}-zip'
               <<: *functest-jobs
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     scm:
       - functest-scm:
           ref: $GERRIT_REFSPEC
@@ -505,7 +642,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-check'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
     scm:
@@ -517,20 +655,22 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.8-rmi'
+    name: 'functest-_-alpine-3.11-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: '3.11'
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.8-pull'
+    name: 'functest-_-alpine-3.11-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: '3.11'
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
@@ -553,6 +693,9 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
+    exclude:
+      - tag: latest
+      - tag: jerma
 
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
@@ -585,11 +728,11 @@
       - 'functest-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-opnfv-functest-components-{tag}-build
+    name: functest-opnfv-functest-benchmarking-cntt-{tag}-build
     <<: *functest-params
-    container: functest-components
-    ref_arg:
-    path: docker/components
+    container: functest-benchmarking-cntt
+    ref_arg: BRANCH
+    path: docker/benchmarking-cntt
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -605,11 +748,11 @@
       - 'functest-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-opnfv-functest-features-{tag}-build
+    name: functest-opnfv-functest-smoke-cntt-{tag}-build
     <<: *functest-params
-    container: functest-features
+    container: functest-smoke-cntt
     ref_arg: BRANCH
-    path: docker/features
+    path: docker/smoke-cntt
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
@@ -618,15 +761,22 @@
     name: 'functest-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
       - functest-branch:
           branch: '{branch}'
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -635,23 +785,23 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.11-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.11-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -672,11 +822,14 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-check'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-check'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-check'
+      - multijob:
+          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}
@@ -703,24 +856,37 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -730,32 +896,47 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-smoke:{tag}
+          name: opnfv/functest-smoke-cntt:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-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_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_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'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-components:{tag}
+          name: opnfv/functest-benchmarking-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -767,21 +948,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - trigger:
     name: functest-patchset-created
@@ -813,13 +979,20 @@
       - functest-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -828,23 +1001,23 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-rmi'
-              <<: *functest-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.11-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.11-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -865,11 +1038,14 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-gate'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-gate'
+      - multijob:
+          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}
@@ -896,24 +1072,37 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_slow-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -923,32 +1112,47 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-smoke:{tag}
+          name: opnfv/functest-smoke-cntt:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-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_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_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'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-components:{tag}
+          name: opnfv/functest-benchmarking-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -960,21 +1164,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-features:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-vgpu-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-stor4nfv_os-run'
-              <<: *functest-jobs
 
 - project:
     name: 'functest'
@@ -994,4 +1183,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z]+-(daily|check|gate)$
+    regex: ^functest(-ovn)?-[a-z]+-(daily|check|gate)$