X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=2ae099529d3178aba625790f1ddabefecce0edf5;hb=fa58f229c41de75e3fd1b44a9a383c5ed539d456;hp=63e04e50f67eeeea82b93623f4e140ee2f73d39a;hpb=3e7ab349e3911c85b1307798f767282c4fc41a5d;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 63e04e50f..2ae099529 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1,7 +1,10 @@
 ---
-- functest-jobs: &functest-jobs
-    name: 'functest-jobs'
-    current-parameters: true
+- functest-containers: &functest-containers
+    name: 'functest-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - functest-params: &functest-params
     name: 'functest-params'
@@ -9,21 +12,44 @@
     port:
     tag:
       - latest:
+          from:
+          buildargs:
           branch: master
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.13
+      - wallaby:
+          from:
+          buildargs:
+          branch: stable/wallaby
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+          dependency: 3.13
+      - leguer:
+          from:
+          buildargs:
+          branch: stable/leguer
           slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.12
+      - kali:
+          from:
+          buildargs:
+          branch: stable/kali
+          slave: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+          dependency: 3.11
       - jerma:
+          from:
+          buildargs:
           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
+          DASHBOARD_URL: http://172.30.12.83
+          dependency: 3.10
+
+- functest-jobs: &functest-jobs
+    name: 'functest-jobs'
+    current-parameters: true
 
 - parameter:
     name: functest-slave
@@ -39,44 +65,31 @@
           name: build_tag
 
 - parameter:
-    name: functest-branch
+    name: functest-EXTERNAL_NETWORK
     parameters:
       - string:
-          name: branch
-          default: '{branch}'
-
+          name: EXTERNAL_NETWORK
+          default: public
 - parameter:
-    name: functest-DEBUG
+    name: functest-VOLUME_DEVICE_NAME
     parameters:
       - string:
-          name: DEBUG
-          default: 'true'
-
+          name: VOLUME_DEVICE_NAME
+          default: sdb
 - parameter:
-    name: functest-EXTERNAL_NETWORK
+    name: functest-IMAGE_PROPERTIES
     parameters:
       - string:
-          name: EXTERNAL_NETWORK
-          default: public
-
-- functest-containers: &functest-containers
-    name: 'functest-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
+          name: IMAGE_PROPERTIES
+          default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
 
 - functest-run-containers: &functest-run-containers
     name: 'functest-run-containers'
     <<: *functest-containers
     test: '{test}'
-    dashboard_url: '{dashboard_url}'
-
-- functest-build-containers: &functest-build-containers
-    name: 'functest-build-containers'
-    <<: *functest-containers
-    ref_arg: '{ref_arg}'
-    path: '{path}'
+    privileged: '{privileged}'
+    network: '{network}'
+    DASHBOARD_URL: '{DASHBOARD_URL}'
 
 - builder:
     name: functest-pull-containers
@@ -92,34 +105,12 @@
           fi
           sudo docker pull $image
 
-- builder:
-    name: functest-build-containers
-    builders:
-      - shell: |
-          set +x
-          if [ "{repo}" = "_" ]; then
-            image={container}:{tag}
-          elif [ "{port}" = "None" ]; then
-            image={repo}/{container}:{tag}
-          else
-            image={repo}:{port}/{container}:{tag}
-          fi
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
-          fi
-          cd {path}
-          sudo docker build $build_arg \
-            --pull=false --no-cache --force-rm=true \
-            -t $image .
-
 - builder:
     name: functest-run-containers
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -127,35 +118,25 @@
           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 \
+            --privileged={privileged} \
+            --network={network} \
             -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 \
+            -v /home/opnfv/functest/.boto:/root/.boto \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_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 \
+            -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
+            -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
+            -e DASHBOARD_URL={DASHBOARD_URL} \
             -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
+            $image run_tests -t {test} -p -r
 
 - builder:
     name: functest-remove-images
@@ -171,15 +152,6 @@
           fi
           sudo docker rmi $image || true
 
-- scm:
-    name: functest-scm
-    scm:
-      - git:
-          url: https://gerrit.opnfv.org/gerrit/functest
-          refspec: '+refs/changes/*:refs/changes/*'
-          branches:
-            - '{ref}'
-
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-pull'
     parameters:
@@ -289,10 +261,12 @@
           slave: '{slave}'
       - functest-build_tag:
           build_tag: ''
-      - functest-DEBUG:
-          DEBUG: 'true'
       - functest-EXTERNAL_NETWORK:
           EXTERNAL_NETWORK: public
+      - functest-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -315,6 +289,8 @@
       - odl
       - tempest_smoke
       - tempest_horizon
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -323,10 +299,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
@@ -336,28 +313,42 @@
       - 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
+    privileged: 'false'
+    network: bridge
     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
+      - {'tag': 'latest', 'test': 'refstack_defcore'}
+      - {'tag': 'latest', 'test': 'networking-bgpvpn'}
+      - {'tag': 'latest', 'test': 'networking-sfc'}
+      - {'tag': 'latest', 'test': 'patrole'}
+      - {'tag': 'wallaby', 'test': 'refstack_defcore'}
+      - {'tag': 'wallaby', 'test': 'networking-bgpvpn'}
+      - {'tag': 'wallaby', 'test': 'networking-sfc'}
+      - {'tag': 'wallaby', 'test': 'patrole'}
+      - {'tag': 'leguer', 'test': 'refstack_defcore'}
+      - {'tag': 'leguer', 'test': 'networking-bgpvpn'}
+      - {'tag': 'leguer', 'test': 'networking-sfc'}
+      - {'tag': 'leguer', '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'}
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -366,13 +357,16 @@
     <<: *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
       - tempest_slow_cntt
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -385,6 +379,8 @@
       - rally_jobs
       - vmtp
       - shaker
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -395,6 +391,8 @@
     test:
       - rally_full_cntt
       - rally_jobs_cntt
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -408,15 +406,18 @@
       - heat_ims
       - vyos_vrouter
       - juju_epc
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
+
 - builder:
     name: functest-zip
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -428,17 +429,31 @@
             -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 \
+            -v /home/opnfv/functest/.boto:/root/.boto \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_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 \
+            -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
+            -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
+            -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
+            -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
+            -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             $image zip_campaign
 
 - job-template:
     name: 'functest-{tag}-zip'
     parameters:
+      - functest-slave:
+          slave: '{slave}'
       - functest-build_tag:
           build_tag: ''
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
+      - functest-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     builders:
       - functest-zip:
           <<: *functest-containers
@@ -454,22 +469,24 @@
     name: 'functest-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
     parameters:
       - functest-slave:
           slave: '{slave}'
       - functest-build_tag:
           build_tag: ''
-      - functest-DEBUG:
-          DEBUG: 'true'
       - functest-EXTERNAL_NETWORK:
           EXTERNAL_NETWORK: public
+      - functest-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-{tag}-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -533,7 +550,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
@@ -541,6 +558,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'
@@ -559,25 +578,33 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole_admin-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole_member-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *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
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cyborg-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'
@@ -606,7 +633,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -624,157 +650,302 @@
             - name: 'functest-{tag}-zip'
               <<: *functest-jobs
 
+- project:
+    name: 'functest-daily'
+    <<: *functest-params
+    jobs:
+      - 'functest-{tag}-daily'
+
+- view:
+    name: functest
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-[a-z0-9.]+-daily$
+
+- functest-build-containers: &functest-build-containers
+    name: 'functest-build-containers'
+    <<: *functest-containers
+    ref_arg: '{ref_arg}'
+    path: '{path}'
+    buildargs: '{buildargs}'
+    from: '{from}'
+
+- builder:
+    name: functest-build-containers
+    builders:
+      - shell: |
+          set +x
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          build_args=""
+          if [ "{buildargs}" != "None" ]; then
+            build_args="{buildargs}"
+          fi
+          if [ "{ref_arg}" != "None" ]; then
+            build_args="$build_args --build-arg {ref_arg}={ref}"
+          fi
+          cd {path}
+          if [ "{from}" != "None" ]; then
+              sed -i {from} Dockerfile
+          fi
+          sudo docker build $build_args \
+            --pull=false --no-cache --force-rm=true \
+            -t $image .
+
+- scm:
+    name: functest-scm
+    scm:
+      - git:
+          url: 'https://gerrit.opnfv.org/gerrit/functest'
+          refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+          branches:
+            - '{ref}'
+
+- functest-dep: &functest-dep
+    name: 'functest-containers'
+    repo: '{repo}'
+    port: '{port}'
+    tag: '{tag}'
+    dependency: '{dependency}'
+
+- builder:
+    name: functest-pull-dep-images
+    builders:
+      - shell: |
+          set +x
+          if [ "_" = "_" ]; then
+            image=alpine:{dependency}
+          elif [ "None" = "None" ]; then
+            image=_/alpine:{dependency}
+          else
+            image=_:/alpine:{dependency}
+          fi
+          sudo docker pull $image || true
+
+- builder:
+    name: functest-remove-dep-images
+    builders:
+      - shell: |
+          set +x
+          if [ "_" = "_" ]; then
+            image=alpine:{dependency}
+          elif [ "" = "None" ]; then
+            image=_/alpine:{dependency}
+          else
+            image=_:/alpine:{dependency}
+          fi
+          sudo docker rmi $image || true
+
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-gate'
+    name: 'functest-{repo}-{tag}-dep-pull'
+    parameters:
+      - functest-slave:
+          slave: '{slave}'
+    builders:
+      - functest-pull-dep-images:
+          <<: *functest-dep
+
+- project:
+    name: 'functest-{repo}-{tag}-dep-pull'
+    <<: *functest-params
+    jobs:
+      - 'functest-{repo}-{tag}-dep-pull'
+
+- job-template:
+    name: 'functest-{repo}-{tag}-dep-rmi'
     parameters:
       - functest-slave:
           slave: '{slave}'
+    builders:
+      - functest-remove-dep-images:
+          <<: *functest-dep
+
+- project:
+    name: 'functest-{repo}-{tag}-dep-rmi'
+    <<: *functest-params
+    jobs:
+      - 'functest-{repo}-{tag}-dep-rmi'
+
+- builder:
+    name: functest-tox
+    builders:
+      - shell: |
+          set +x
+          sudo apt-get update && sudo apt-get install \
+            software-properties-common gpg -y
+          sudo add-apt-repository -y ppa:deadsnakes/ppa
+          sudo apt-get update && sudo apt-get install python3.8 \
+            python3.8-dev python3.8-distutils \
+            python3.7 python3.7-dev python3.6 python3.6-dev \
+            python python-dev python3-pip enchant -y
+          sudo pip3 install tox tox-pip-version
+
+          tox
+
+- job-template:
+    name: 'functest-{tag}-tox'
     scm:
       - functest-scm:
           ref: $GERRIT_REFSPEC
+    triggers:
+      - functest-patchset-created:
+          branch: '{branch}'
+    parameters:
+      - functest-slave:
+          slave: '{slave}'
     builders:
-      - functest-build-containers:
-          <<: *functest-build-containers
-          ref: $GERRIT_REFSPEC
+      - functest-tox:
+
+- project:
+    name: functest-tox
+    <<: *functest-params
+    jobs:
+      - 'functest-{tag}-tox'
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-check'
+    name: 'functest-{repo}-{container}-{tag}-gate'
     parameters:
       - functest-slave:
           slave: '{slave}'
-      - functest-branch:
-          branch: '{branch}'
     scm:
       - functest-scm:
-          ref: $branch
+          ref: $GERRIT_REFSPEC
     builders:
       - functest-build-containers:
           <<: *functest-build-containers
-          ref: $branch
-
-- project:
-    name: 'functest-_-alpine-3.11-rmi'
-    repo: _
-    port:
-    container: alpine
-    tag: '3.11'
-    slave: master
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
-
-- project:
-    name: 'functest-_-alpine-3.11-pull'
-    repo: _
-    port:
-    container: alpine
-    tag: '3.11'
-    slave: master
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
+          ref: $GERRIT_REFSPEC
+          buildargs: '{buildargs}'
 
 - project:
-    name: functest-opnfv-functest-core-{tag}-build
+    name: functest-opnfv-functest-core-{tag}-gate
     <<: *functest-params
     container: functest-core
     ref_arg: BRANCH
     path: docker/core
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-opnfv-functest-tempest-{tag}-build
+    name: functest-opnfv-functest-tempest-{tag}-gate
     <<: *functest-params
     container: functest-tempest
     ref_arg: BRANCH
     path: docker/tempest
+    exclude:
+      - {'tag': 'latest'}
+      - {'tag': 'wallaby'}
+      - {'tag': 'leguer'}
+      - {'tag': 'kali'}
+      - {'tag': 'jerma'}
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
-    exclude:
-      - tag: latest
-      - tag: jerma
 
 - project:
-    name: functest-opnfv-functest-healthcheck-{tag}-build
+    name: functest-opnfv-functest-healthcheck-{tag}-gate
     <<: *functest-params
     container: functest-healthcheck
     ref_arg: BRANCH
     path: docker/healthcheck
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-opnfv-functest-smoke-{tag}-build
+    name: functest-opnfv-functest-smoke-{tag}-gate
     <<: *functest-params
     container: functest-smoke
     ref_arg: BRANCH
     path: docker/smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-opnfv-functest-benchmarking-{tag}-build
+    name: functest-opnfv-functest-benchmarking-{tag}-gate
     <<: *functest-params
     container: functest-benchmarking
     ref_arg: BRANCH
     path: docker/benchmarking
     jobs:
       - '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
+    name: functest-opnfv-functest-vnf-{tag}-gate
     <<: *functest-params
     container: functest-vnf
     ref_arg:
     path: docker/vnf
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-opnfv-functest-smoke-cntt-{tag}-build
+    name: functest-opnfv-functest-smoke-cntt-{tag}-gate
     <<: *functest-params
     container: functest-smoke-cntt
     ref_arg: BRANCH
     path: docker/smoke-cntt
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
+
+- project:
+    name: functest-opnfv-functest-benchmarking-cntt-{tag}-gate
+    <<: *functest-params
+    container: functest-benchmarking-cntt
+    ref_arg: BRANCH
+    path: docker/benchmarking-cntt
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-gate'
+
+
+- trigger:
+    name: functest-patchset-created
+    triggers:
+      - gerrit:
+          trigger-on:
+            - patchset-created-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'functest'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
 
 - job-template:
-    name: 'functest-{tag}-check'
+    name: 'functest-{tag}-review'
     project-type: multijob
+    triggers:
+      - functest-patchset-created:
+          branch: '{branch}'
     parameters:
       - functest-slave:
           slave: '{slave}'
       - functest-build_tag:
           build_tag: ''
-      - functest-branch:
-          branch: '{branch}'
-      - functest-DEBUG:
-          DEBUG: 'true'
       - functest-EXTERNAL_NETWORK:
           EXTERNAL_NETWORK: public
+      - functest-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-{tag}-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -792,42 +963,42 @@
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
       - multijob:
-          name: remove dependencies
+          name: remove dependency
           projects:
-            - name: 'functest-_-alpine-3.11-rmi'
+            - name: 'functest-{repo}-{tag}-dep-rmi'
               <<: *functest-jobs
       - multijob:
-          name: pull dependencies
+          name: pull dependency
           projects:
-            - name: 'functest-_-alpine-3.11-pull'
+            - name: 'functest-{repo}-{tag}-dep-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
           projects:
-            - name: 'functest-opnfv-functest-core-{tag}-check'
+            - name: 'functest-opnfv-functest-core-{tag}-gate'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-tempest
           projects:
-            - name: 'functest-opnfv-functest-tempest-{tag}-check'
+            - name: 'functest-opnfv-functest-tempest-{tag}-gate'
               <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-check'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-check'
+            - name: 'functest-opnfv-functest-smoke-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-check'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-vnf-{tag}-check'
+            - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
       - multijob:
           name: build cntt containers
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-check'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-check'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-gate'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
@@ -861,7 +1032,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
@@ -869,6 +1040,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'
@@ -887,25 +1060,33 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole_admin-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole_member-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *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}-tempest_octavia-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cyborg-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'
@@ -934,7 +1115,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -947,232 +1127,312 @@
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
 
+- project:
+    name: 'functest-review'
+    <<: *functest-params
+    jobs:
+      - 'functest-{tag}-review'
+
+- view:
+    name: functest-review
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-[a-z0-9.]+-review$
+
+- view:
+    name: functest-tox
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-[a-z0-9.]+-tox$
+
+- builder:
+    name: functest-push-containers
+    builders:
+      - shell: |
+          set +x
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker push $image
+
 - trigger:
-    name: functest-patchset-created
+    name: functest-commit
     triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'functest'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
+      - pollscm:
+          cron: "*/30 * * * *"
+
+- job-template:
+    name: 'functest-{repo}-{container}-{tag}-build'
+    parameters:
+      - functest-slave:
+          slave: '{slave}'
+    scm:
+      - functest-scm:
+          ref: '{branch}'
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+          buildargs: '{buildargs}'
+      - functest-push-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+
+- project:
+    name: functest-opnfv-functest-core-{tag}-build
+    <<: *functest-params
+    container: functest-core
+    ref_arg: BRANCH
+    path: docker/core
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-opnfv-functest-tempest-{tag}-build
+    <<: *functest-params
+    container: functest-tempest
+    ref_arg: BRANCH
+    path: docker/tempest
+    exclude:
+      - {'tag': 'latest'}
+      - {'tag': 'wallaby'}
+      - {'tag': 'leguer'}
+      - {'tag': 'kali'}
+      - {'tag': 'jerma'}
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-opnfv-functest-healthcheck-{tag}-build
+    <<: *functest-params
+    container: functest-healthcheck
+    ref_arg: BRANCH
+    path: docker/healthcheck
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-opnfv-functest-smoke-{tag}-build
+    <<: *functest-params
+    container: functest-smoke
+    ref_arg: BRANCH
+    path: docker/smoke
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-opnfv-functest-benchmarking-{tag}-build
+    <<: *functest-params
+    container: functest-benchmarking
+    ref_arg: BRANCH
+    path: docker/benchmarking
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-opnfv-functest-vnf-{tag}-build
+    <<: *functest-params
+    container: functest-vnf
+    ref_arg:
+    path: docker/vnf
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-opnfv-functest-smoke-cntt-{tag}-build
+    <<: *functest-params
+    container: functest-smoke-cntt
+    ref_arg: BRANCH
+    path: docker/smoke-cntt
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-build'
+
+- 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}-build'
+
 
 - job-template:
-    name: 'functest-{tag}-gate'
+    name: 'functest-{tag}-docker'
     project-type: multijob
     triggers:
-      - functest-patchset-created:
-          branch: '{branch}'
+      - functest-commit
+    scm:
+      - functest-scm:
+          ref: '{branch}'
     parameters:
       - 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-{tag}-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
-          name: remove former images
+          name: remove dependency
           projects:
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-rmi'
-              <<: *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-benchmarking-cntt-{tag}-rmi'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
+            - name: 'functest-{repo}-{tag}-dep-rmi'
               <<: *functest-jobs
       - multijob:
-          name: remove dependencies
+          name: pull dependency
           projects:
-            - name: 'functest-_-alpine-3.11-rmi'
-              <<: *functest-jobs
-      - multijob:
-          name: pull dependencies
-          projects:
-            - name: 'functest-_-alpine-3.11-pull'
+            - name: 'functest-{repo}-{tag}-dep-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
           projects:
-            - name: 'functest-opnfv-functest-core-{tag}-gate'
+            - name: 'functest-opnfv-functest-core-{tag}-build'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-tempest
           projects:
-            - name: 'functest-opnfv-functest-tempest-{tag}-gate'
+            - name: 'functest-opnfv-functest-tempest-{tag}-build'
               <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-gate'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-build'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-gate'
+            - name: 'functest-opnfv-functest-smoke-{tag}-build'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-gate'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-build'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-vnf-{tag}-gate'
+            - name: 'functest-opnfv-functest-vnf-{tag}-build'
               <<: *functest-jobs
       - multijob:
           name: build cntt containers
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-build'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-gate'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-healthcheck:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-vmready1-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-vmready2-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-singlevm1-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-singlevm2-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-vping_ssh-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-vping_userdata-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-cinder_test-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-smoke:{tag}
-          projects:
-            - 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}-tempest_heat-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}-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}-patrole-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
-              <<: *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-cntt:{tag}
-          projects:
-            - 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-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
-          projects:
-            - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-vnf-{tag}-cloudify_ims-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-vnf-{tag}-heat_ims-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
+            - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-build'
               <<: *functest-jobs
 
+- builder:
+    name: functest-trivy
+    builders:
+      - shell: |
+          sudo apt-get update && sudo apt-get install curl -y
+
+          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          ./trivy --exit-code 1 $image
+
+- job-template:
+    name: 'functest-{repo}-{container}-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-slave:
+          slave: '{slave}'
+    builders:
+      - functest-trivy:
+          <<: *functest-containers
+
+- project:
+    name: 'functest-opnfv-functest-core-trivy'
+    <<: *functest-params
+    container: 'functest-core'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-opnfv-functest-tempest-trivy'
+    <<: *functest-params
+    container: 'functest-tempest'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-opnfv-functest-healthcheck-trivy'
+    <<: *functest-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-opnfv-functest-smoke-trivy'
+    <<: *functest-params
+    container: 'functest-smoke'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-opnfv-functest-benchmarking-trivy'
+    <<: *functest-params
+    container: 'functest-benchmarking'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-opnfv-functest-vnf-trivy'
+    <<: *functest-params
+    container: 'functest-vnf'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-opnfv-functest-smoke-cntt-trivy'
+    <<: *functest-params
+    container: 'functest-smoke-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-opnfv-functest-benchmarking-cntt-trivy'
+    <<: *functest-params
+    container: 'functest-benchmarking-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-trivy'
+
 - project:
     name: 'functest'
     <<: *functest-params
     jobs:
-      - 'functest-{tag}-daily'
-      - 'functest-{tag}-check'
-      - 'functest-{tag}-gate'
+      - 'functest-{tag}-docker'
 
 - view:
-    name: functest
+    name: functest-docker
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-[a-z0-9.]+-docker$
+
+- view:
+    name: functest-trivy
     view-type: list
     columns:
       - status
@@ -1181,4 +1441,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest(-ovn)?-[a-z]+-(daily|check|gate)$
+    regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-trivy$