X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=463dd9a0aa4ae787b059febd4040da042d5a97b4;hb=9aec98597417238ccd75fe0640f1cc8c0c4c5ea2;hp=e86d4d5cc3f5b8300d13408fcfd629c90aeded09;hpb=614aee944d328589adc1d2da888462830dd85fac;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index e86d4d5cc..463dd9a0a 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -8,35 +8,292 @@
 
 - functest-params: &functest-params
     name: 'functest-params'
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+          dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+          dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          node: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+          dependency: 3.13
+
+- functest-opnfv-functest-healthcheck-params: &functest-opnfv-functest-healthcheck-params
+    name: 'functest-opnfv-functest-healthcheck-params'
+    repo: 'opnfv'
+    container: 'functest-healthcheck'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+          dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+          dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          node: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+          dependency: 3.13
+
+- functest-opnfv-functest-smoke-params: &functest-opnfv-functest-smoke-params
+    name: 'functest-opnfv-functest-smoke-params'
+    repo: 'opnfv'
+    container: 'functest-smoke'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+          dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+          dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          node: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+          dependency: 3.13
+
+- functest-opnfv-functest-smoke-cntt-params: &functest-opnfv-functest-smoke-cntt-params
+    name: 'functest-opnfv-functest-smoke-cntt-params'
+    repo: 'opnfv'
+    container: 'functest-smoke-cntt'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+          dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+          dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          node: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+          dependency: 3.13
+
+- functest-opnfv-functest-benchmarking-params: &functest-opnfv-functest-benchmarking-params
+    name: 'functest-opnfv-functest-benchmarking-params'
+    repo: 'opnfv'
+    container: 'functest-benchmarking'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+          dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+          dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          node: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+          dependency: 3.13
+
+- functest-opnfv-functest-benchmarking-cntt-params: &functest-opnfv-functest-benchmarking-cntt-params
+    name: 'functest-opnfv-functest-benchmarking-cntt-params'
+    repo: 'opnfv'
+    container: 'functest-benchmarking-cntt'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+          dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+          dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          node: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+          dependency: 3.13
+
+- functest-opnfv-functest-vnf-params: &functest-opnfv-functest-vnf-params
+    name: 'functest-opnfv-functest-vnf-params'
     repo: 'opnfv'
+    container: 'functest-vnf'
     port:
     tag:
       - latest:
           from:
           build_args:
           branch: master
-          slave: lf-pod4
+          node: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
           dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
       - yoga:
           from:
           build_args:
           branch: stable/yoga
-          slave: lf-pod4-3
+          node: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
           dependency: 3.14
       - xena:
           from:
           build_args:
           branch: stable/xena
-          slave: lf-pod4-2
+          node: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
           dependency: 3.14
       - wallaby:
           from:
           build_args:
           branch: stable/wallaby
-          slave: lf-virtual6
+          node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
@@ -45,11 +302,11 @@
     current-parameters: true
 
 - parameter:
-    name: functest-slave
+    name: functest-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: functest-build_tag
@@ -81,7 +338,6 @@
 - functest-run-containers: &functest-run-containers
     name: 'functest-run-containers'
     <<: *functest-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -147,7 +403,7 @@
             -v /home/opnfv/functest/.boto:/etc/boto.cfg \
             -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 NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DASHBOARD_URL={DASHBOARD_URL} \
@@ -168,112 +424,190 @@
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-pull'
+    name: 'functest-opnfv-functest-healthcheck-{tag}-pull'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-pull-containers:
           <<: *functest-containers
 
 - project:
     name: 'functest-opnfv-functest-healthcheck-pull'
-    <<: *functest-params
-    container: 'functest-healthcheck'
+    <<: *functest-opnfv-functest-healthcheck-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
+      - 'functest-opnfv-functest-healthcheck-{tag}-pull'
 
-- project:
-    name: 'functest-opnfv-functest-smoke-pull'
-    <<: *functest-params
-    container: 'functest-smoke'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
+- job-template:
+    name: 'functest-opnfv-functest-healthcheck-{tag}-rmi'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-remove-images:
+          <<: *functest-containers
 
 - project:
-    name: 'functest-opnfv-functest-smoke-cntt-pull'
-    <<: *functest-params
-    container: 'functest-smoke-cntt'
+    name: 'functest-opnfv-functest-healthcheck-rmi'
+    <<: *functest-opnfv-functest-healthcheck-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
+      - 'functest-opnfv-functest-healthcheck-{tag}-rmi'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-{tag}-pull'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-pull-containers:
+          <<: *functest-containers
 
 - project:
-    name: 'functest-opnfv-functest-benchmarking-pull'
-    <<: *functest-params
-    container: 'functest-benchmarking'
+    name: 'functest-opnfv-functest-smoke-pull'
+    <<: *functest-opnfv-functest-smoke-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
+      - 'functest-opnfv-functest-smoke-{tag}-pull'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-{tag}-rmi'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-remove-images:
+          <<: *functest-containers
 
 - project:
-    name: 'functest-opnfv-functest-benchmarking-cntt-pull'
-    <<: *functest-params
-    container: 'functest-benchmarking-cntt'
+    name: 'functest-opnfv-functest-smoke-rmi'
+    <<: *functest-opnfv-functest-smoke-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
+      - 'functest-opnfv-functest-smoke-{tag}-rmi'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-cntt-{tag}-pull'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-pull-containers:
+          <<: *functest-containers
 
 - project:
-    name: 'functest-opnfv-functest-vnf-pull'
-    <<: *functest-params
-    container: 'functest-vnf'
+    name: 'functest-opnfv-functest-smoke-cntt-pull'
+    <<: *functest-opnfv-functest-smoke-cntt-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
+      - 'functest-opnfv-functest-smoke-cntt-{tag}-pull'
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-rmi'
+    name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-remove-images:
           <<: *functest-containers
 
 - project:
-    name: 'functest-opnfv-functest-healthcheck-rmi'
-    <<: *functest-params
-    container: 'functest-healthcheck'
+    name: 'functest-opnfv-functest-smoke-cntt-rmi'
+    <<: *functest-opnfv-functest-smoke-cntt-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-pull-containers:
+          <<: *functest-containers
 
 - project:
-    name: 'functest-opnfv-functest-smoke-rmi'
-    <<: *functest-params
-    container: 'functest-smoke'
+    name: 'functest-opnfv-functest-benchmarking-pull'
+    <<: *functest-opnfv-functest-benchmarking-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - 'functest-opnfv-functest-benchmarking-{tag}-pull'
 
-- project:
-    name: 'functest-opnfv-functest-smoke-cntt-rmi'
-    <<: *functest-params
-    container: 'functest-smoke-cntt'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-remove-images:
+          <<: *functest-containers
 
 - project:
     name: 'functest-opnfv-functest-benchmarking-rmi'
-    <<: *functest-params
-    container: 'functest-benchmarking'
+    <<: *functest-opnfv-functest-benchmarking-params
+    jobs:
+      - 'functest-opnfv-functest-benchmarking-{tag}-rmi'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-pull'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-pull-containers:
+          <<: *functest-containers
+
+- project:
+    name: 'functest-opnfv-functest-benchmarking-cntt-pull'
+    <<: *functest-opnfv-functest-benchmarking-cntt-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-pull'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-remove-images:
+          <<: *functest-containers
 
 - project:
     name: 'functest-opnfv-functest-benchmarking-cntt-rmi'
-    <<: *functest-params
-    container: 'functest-benchmarking-cntt'
+    <<: *functest-opnfv-functest-benchmarking-cntt-params
+    jobs:
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-pull'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-pull-containers:
+          <<: *functest-containers
+
+- project:
+    name: 'functest-opnfv-functest-vnf-pull'
+    <<: *functest-opnfv-functest-vnf-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - 'functest-opnfv-functest-vnf-{tag}-pull'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-rmi'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-remove-images:
+          <<: *functest-containers
 
 - project:
     name: 'functest-opnfv-functest-vnf-rmi'
-    <<: *functest-params
-    container: 'functest-vnf'
+    <<: *functest-opnfv-functest-vnf-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - 'functest-opnfv-functest-vnf-{tag}-rmi'
 
 - job-template:
     name: 'functest-opnfv-functest-healthcheck-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -285,10 +619,11 @@
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-opnfv-functest-healthcheck'
-    <<: *functest-params
+    <<: *functest-opnfv-functest-healthcheck-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -322,8 +657,8 @@
 - job-template:
     name: 'functest-opnfv-functest-smoke-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -335,10 +670,11 @@
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-opnfv-functest-smoke'
-    <<: *functest-params
+    <<: *functest-opnfv-functest-smoke-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -377,8 +713,8 @@
 - job-template:
     name: 'functest-opnfv-functest-smoke-cntt-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -390,10 +726,11 @@
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-opnfv-functest-smoke-cntt'
-    <<: *functest-params
+    <<: *functest-opnfv-functest-smoke-cntt-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -422,8 +759,8 @@
 - job-template:
     name: 'functest-opnfv-functest-benchmarking-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -435,10 +772,11 @@
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-opnfv-functest-benchmarking'
-    <<: *functest-params
+    <<: *functest-opnfv-functest-benchmarking-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -463,8 +801,8 @@
 - job-template:
     name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -476,10 +814,11 @@
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-opnfv-functest-benchmarking-cntt'
-    <<: *functest-params
+    <<: *functest-opnfv-functest-benchmarking-cntt-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -502,8 +841,8 @@
 - job-template:
     name: 'functest-opnfv-functest-vnf-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -515,10 +854,11 @@
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-opnfv-functest-vnf'
-    <<: *functest-params
+    <<: *functest-opnfv-functest-vnf-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -572,6 +912,8 @@
           sudo mkdir -p $WORKSPACE/results
           sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
@@ -581,15 +923,17 @@
             -v /home/opnfv/functest/.boto:/etc/boto.cfg \
             -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=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DASHBOARD_URL={DASHBOARD_URL} \
             $image zip_campaign
 
 - job-template:
     name: 'functest-{tag}-zip'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -600,16 +944,11 @@
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     builders:
       - functest-zip:
-          <<: *functest-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *functest-run-containers
 
 - project:
-    name: 'functest-{tag}-zip'
-    <<: *functest-params
+    name: 'functest-zip'
+    <<: *functest-opnfv-functest-healthcheck-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -619,6 +958,8 @@
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     published_ports:
     container: 'functest-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
@@ -630,8 +971,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -825,7 +1166,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z0-9.]+-daily$
+    regex: ^functest-[a-z0-9.-]+-daily$
 
 - functest-build-containers: &functest-build-containers
     name: 'functest-build-containers'
@@ -875,67 +1216,56 @@
 - functest-dep: &functest-dep
     name: 'functest-containers'
     repo: '{repo}'
+    container: '{container}'
     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
+    tag: '{dependency}'
 
 - job-template:
-    name: 'functest-{repo}-{tag}-dep-pull'
+    name: 'functest-{tag}-dep-pull'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
-      - functest-pull-dep-images:
+      - functest-pull-containers:
           <<: *functest-dep
 
+- functest-dep-params: &functest-dep-params
+    name: 'functest-dep-params'
+    repo: '_'
+    container: 'alpine'
+    port:
+    tag:
+      - latest:
+          dependency: 3.14
+      - zed:
+          dependency: 3.14
+      - yoga:
+          dependency: 3.14
+      - xena:
+          dependency: 3.14
+      - wallaby:
+          dependency: 3.13
+
 - project:
-    name: 'functest-{repo}-{tag}-dep-pull'
-    <<: *functest-params
+    name: 'functest-dep-pull'
+    <<: *functest-dep-params
     jobs:
-      - 'functest-{repo}-{tag}-dep-pull'
+      - 'functest-{tag}-dep-pull'
 
 - job-template:
-    name: 'functest-{repo}-{tag}-dep-rmi'
+    name: 'functest-{tag}-dep-rmi'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
-      - functest-remove-dep-images:
+      - functest-remove-images:
           <<: *functest-dep
 
 - project:
-    name: 'functest-{repo}-{tag}-dep-rmi'
-    <<: *functest-params
+    name: 'functest-dep-rmi'
+    <<: *functest-dep-params
     jobs:
-      - 'functest-{repo}-{tag}-dep-rmi'
+      - 'functest-{tag}-dep-rmi'
 
 - builder:
     name: functest-tox
@@ -955,9 +1285,8 @@
             python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             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
+            python3-pip enchant-2 -y
+          sudo pip3 install tox
 
           tox
 
@@ -970,8 +1299,8 @@
       - functest-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-tox:
 
@@ -982,10 +1311,10 @@
       - 'functest-{tag}-tox'
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-gate'
+    name: 'functest-opnfv-functest-core-{tag}-gate'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     scm:
       - functest-scm:
           ref: $GERRIT_REFSPEC
@@ -996,83 +1325,165 @@
           build_args: '{build_args}'
 
 - project:
-    name: functest-opnfv-functest-core-{tag}-gate
+    name: functest-opnfv-functest-core-gate
     <<: *functest-params
+    repo: opnfv
+    port:
     container: functest-core
     ref_arg: BRANCH
     path: docker/core
     jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-opnfv-functest-core-{tag}-gate'
 
-- project:
-    name: functest-opnfv-functest-tempest-{tag}-gate
-    <<: *functest-params
-    container: functest-tempest
-    ref_arg: BRANCH
-    path: docker/tempest
-    exclude:
-      - {'tag': 'latest'}
-      - {'tag': 'xena'}
-      - {'tag': 'wallaby'}
-      - {'tag': 'leguer'}
-      - {'tag': 'kali'}
-      - {'tag': 'jerma'}
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+- job-template:
+    name: 'functest-opnfv-functest-healthcheck-{tag}-gate'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
-    name: functest-opnfv-functest-healthcheck-{tag}-gate
+    name: functest-opnfv-functest-healthcheck-gate
     <<: *functest-params
+    repo: opnfv
+    port:
     container: functest-healthcheck
     ref_arg: BRANCH
     path: docker/healthcheck
     jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-opnfv-functest-healthcheck-{tag}-gate'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-{tag}-gate'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
-    name: functest-opnfv-functest-smoke-{tag}-gate
+    name: functest-opnfv-functest-smoke-gate
     <<: *functest-params
+    repo: opnfv
+    port:
     container: functest-smoke
     ref_arg: BRANCH
     path: docker/smoke
     jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-opnfv-functest-smoke-{tag}-gate'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-{tag}-gate'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
-    name: functest-opnfv-functest-benchmarking-{tag}-gate
+    name: functest-opnfv-functest-benchmarking-gate
     <<: *functest-params
+    repo: opnfv
+    port:
     container: functest-benchmarking
     ref_arg: BRANCH
     path: docker/benchmarking
     jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-opnfv-functest-benchmarking-{tag}-gate'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-gate'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
-    name: functest-opnfv-functest-vnf-{tag}-gate
+    name: functest-opnfv-functest-vnf-gate
     <<: *functest-params
+    repo: opnfv
+    port:
     container: functest-vnf
     ref_arg:
     path: docker/vnf
     jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-opnfv-functest-vnf-{tag}-gate'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
-    name: functest-opnfv-functest-smoke-cntt-{tag}-gate
+    name: functest-opnfv-functest-smoke-cntt-gate
     <<: *functest-params
+    repo: opnfv
+    port:
     container: functest-smoke-cntt
     ref_arg: BRANCH
     path: docker/smoke-cntt
     jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-gate'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
-    name: functest-opnfv-functest-benchmarking-cntt-{tag}-gate
+    name: functest-opnfv-functest-benchmarking-cntt-gate
     <<: *functest-params
+    repo: opnfv
+    port:
     container: functest-benchmarking-cntt
     ref_arg: BRANCH
     path: docker/benchmarking-cntt
     jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-gate'
 
 - trigger:
     name: functest-patchset-created
@@ -1098,8 +1509,8 @@
       - functest-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -1135,23 +1546,18 @@
       - multijob:
           name: remove dependency
           projects:
-            - name: 'functest-{repo}-{tag}-dep-rmi'
+            - name: 'functest-{tag}-dep-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'functest-{repo}-{tag}-dep-pull'
+            - name: 'functest-{tag}-dep-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
           projects:
             - name: 'functest-opnfv-functest-core-{tag}-gate'
               <<: *functest-jobs
-      - multijob:
-          name: build opnfv/functest-tempest
-          projects:
-            - name: 'functest-opnfv-functest-tempest-{tag}-gate'
-              <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
@@ -1311,7 +1717,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z0-9.]+-review$
+    regex: ^functest-[a-z0-9.-]+-review$
 
 - view:
     name: functest-tox
@@ -1323,7 +1729,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z0-9.]+-tox$
+    regex: ^functest-[a-z0-9.-]+-tox$
 
 - builder:
     name: functest-push-containers
@@ -1346,10 +1752,10 @@
           cron: "*/30 * * * *"
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-build'
+    name: 'functest-opnfv-functest-core-{tag}-build'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     scm:
       - functest-scm:
           ref: '{branch}'
@@ -1363,83 +1769,183 @@
           ref: '{branch}'
 
 - project:
-    name: functest-opnfv-functest-core-{tag}-build
+    name: functest-opnfv-functest-core-build
     <<: *functest-params
+    repo: opnfv
     container: functest-core
+    port:
     ref_arg: BRANCH
     path: docker/core
     jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-core-{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': 'xena'}
-      - {'tag': 'wallaby'}
-      - {'tag': 'leguer'}
-      - {'tag': 'kali'}
-      - {'tag': 'jerma'}
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+- job-template:
+    name: 'functest-opnfv-functest-healthcheck-{tag}-build'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: '{branch}'
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-push-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
 
 - project:
-    name: functest-opnfv-functest-healthcheck-{tag}-build
+    name: functest-opnfv-functest-healthcheck-build
     <<: *functest-params
+    repo: opnfv
     container: functest-healthcheck
+    port:
     ref_arg: BRANCH
     path: docker/healthcheck
     jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-healthcheck-{tag}-build'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-{tag}-build'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: '{branch}'
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-push-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
 
 - project:
-    name: functest-opnfv-functest-smoke-{tag}-build
+    name: functest-opnfv-functest-smoke-build
     <<: *functest-params
+    repo: opnfv
     container: functest-smoke
+    port:
     ref_arg: BRANCH
     path: docker/smoke
     jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-smoke-{tag}-build'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-{tag}-build'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: '{branch}'
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-push-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
 
 - project:
-    name: functest-opnfv-functest-benchmarking-{tag}-build
+    name: functest-opnfv-functest-benchmarking-build
     <<: *functest-params
+    repo: opnfv
     container: functest-benchmarking
+    port:
     ref_arg: BRANCH
     path: docker/benchmarking
     jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-benchmarking-{tag}-build'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-build'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: '{branch}'
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-push-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
 
 - project:
-    name: functest-opnfv-functest-vnf-{tag}-build
+    name: functest-opnfv-functest-vnf-build
     <<: *functest-params
+    repo: opnfv
     container: functest-vnf
+    port:
     ref_arg:
     path: docker/vnf
     jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-vnf-{tag}-build'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-cntt-{tag}-build'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: '{branch}'
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-push-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
 
 - project:
-    name: functest-opnfv-functest-smoke-cntt-{tag}-build
+    name: functest-opnfv-functest-smoke-cntt-build
     <<: *functest-params
+    repo: opnfv
     container: functest-smoke-cntt
+    port:
     ref_arg: BRANCH
     path: docker/smoke-cntt
     jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-smoke-cntt-{tag}-build'
 
-- project:
-    name: functest-opnfv-functest-benchmarking-cntt-{tag}-build
-    <<: *functest-params
-    container: functest-benchmarking-cntt
-    ref_arg: BRANCH
-    path: docker/benchmarking-cntt
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-build'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    scm:
+      - functest-scm:
+          ref: '{branch}'
+    builders:
+      - functest-build-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-push-containers:
+          <<: *functest-build-containers
+          ref: '{branch}'
+
+- project:
+    name: functest-opnfv-functest-benchmarking-cntt-build
+    <<: *functest-params
+    repo: opnfv
+    container: functest-benchmarking-cntt
+    port:
+    ref_arg: BRANCH
+    path: docker/benchmarking-cntt
     jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-build'
 
 - job-template:
     name: 'functest-{tag}-docker'
@@ -1450,8 +1956,8 @@
       - functest-scm:
           ref: '{branch}'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
@@ -1464,23 +1970,18 @@
       - multijob:
           name: remove dependency
           projects:
-            - name: 'functest-{repo}-{tag}-dep-rmi'
+            - name: 'functest-{tag}-dep-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'functest-{repo}-{tag}-dep-pull'
+            - name: 'functest-{tag}-dep-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
           projects:
             - name: 'functest-opnfv-functest-core-{tag}-build'
               <<: *functest-jobs
-      - multijob:
-          name: build opnfv/functest-tempest
-          projects:
-            - name: 'functest-opnfv-functest-tempest-{tag}-build'
-              <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
@@ -1506,6 +2007,12 @@
           fixed: true
           recipients: cedric.ollivier@orange.com
 
+- project:
+    name: 'functest-docker'
+    <<: *functest-params
+    jobs:
+      - 'functest-{tag}-docker'
+
 - builder:
     name: functest-trivy
     builders:
@@ -1525,12 +2032,12 @@
           ./trivy image --exit-code 1 $image
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-trivy'
+    name: 'functest-opnfv-functest-core-{tag}-trivy'
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-trivy:
           <<: *functest-containers
@@ -1544,58 +2051,167 @@
 - project:
     name: 'functest-opnfv-functest-core-trivy'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-core'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+      - 'functest-opnfv-functest-core-{tag}-trivy'
 
-- project:
-    name: 'functest-opnfv-functest-tempest-trivy'
-    <<: *functest-params
-    container: 'functest-tempest'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+- job-template:
+    name: 'functest-opnfv-functest-healthcheck-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-trivy:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-healthcheck-trivy'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-healthcheck'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+      - 'functest-opnfv-functest-healthcheck-{tag}-trivy'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-trivy:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-smoke-trivy'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-smoke'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+      - 'functest-opnfv-functest-smoke-{tag}-trivy'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-trivy:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-benchmarking-trivy'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-benchmarking'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+      - 'functest-opnfv-functest-benchmarking-{tag}-trivy'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-trivy:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-vnf-trivy'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-vnf'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+      - 'functest-opnfv-functest-vnf-{tag}-trivy'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-cntt-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-trivy:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-smoke-cntt-trivy'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-smoke-cntt'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+      - 'functest-opnfv-functest-smoke-cntt-{tag}-trivy'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-trivy:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-benchmarking-cntt-trivy'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-benchmarking-cntt'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-trivy'
 
 - builder:
     name: functest-grype
@@ -1616,12 +2232,12 @@
           ./grype -q $image
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-grype'
+    name: 'functest-opnfv-functest-core-{tag}-grype'
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-grype:
           <<: *functest-containers
@@ -1635,64 +2251,368 @@
 - project:
     name: 'functest-opnfv-functest-core-grype'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-core'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-core-{tag}-grype'
 
-- project:
-    name: 'functest-opnfv-functest-tempest-grype'
-    <<: *functest-params
-    container: 'functest-tempest'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+- job-template:
+    name: 'functest-opnfv-functest-healthcheck-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-grype:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-healthcheck-grype'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-healthcheck'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-healthcheck-{tag}-grype'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-grype:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-smoke-grype'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-smoke'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-smoke-{tag}-grype'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-grype:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-benchmarking-grype'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-benchmarking'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-benchmarking-{tag}-grype'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-grype:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-vnf-grype'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-vnf'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-vnf-{tag}-grype'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-cntt-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-grype:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-smoke-cntt-grype'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-smoke-cntt'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-smoke-cntt-{tag}-grype'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-grype:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-benchmarking-cntt-grype'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-benchmarking-cntt'
+    port:
+    jobs:
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-grype'
+
+- builder:
+    name: functest-sbom
+    builders:
+      - shell: |
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          sudo mkdir -p ~/.docker
+          curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sudo sh -s --
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker sbom $image
+
+- job-template:
+    name: 'functest-opnfv-functest-core-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-opnfv-functest-core-sbom'
+    <<: *functest-params
+    repo: 'opnfv'
+    container: 'functest-core'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-core-{tag}-sbom'
+
+- job-template:
+    name: 'functest-opnfv-functest-healthcheck-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
-    name: 'functest'
+    name: 'functest-opnfv-functest-healthcheck-sbom'
     <<: *functest-params
+    repo: 'opnfv'
+    container: 'functest-healthcheck'
+    port:
     jobs:
-      - 'functest-{tag}-docker'
+      - 'functest-opnfv-functest-healthcheck-{tag}-sbom'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-opnfv-functest-smoke-sbom'
+    <<: *functest-params
+    repo: 'opnfv'
+    container: 'functest-smoke'
+    port:
+    jobs:
+      - 'functest-opnfv-functest-smoke-{tag}-sbom'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-opnfv-functest-benchmarking-sbom'
+    <<: *functest-params
+    repo: 'opnfv'
+    container: 'functest-benchmarking'
+    port:
+    jobs:
+      - 'functest-opnfv-functest-benchmarking-{tag}-sbom'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-opnfv-functest-vnf-sbom'
+    <<: *functest-params
+    repo: 'opnfv'
+    container: 'functest-vnf'
+    port:
+    jobs:
+      - 'functest-opnfv-functest-vnf-{tag}-sbom'
+
+- job-template:
+    name: 'functest-opnfv-functest-smoke-cntt-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-opnfv-functest-smoke-cntt-sbom'
+    <<: *functest-params
+    repo: 'opnfv'
+    container: 'functest-smoke-cntt'
+    port:
+    jobs:
+      - 'functest-opnfv-functest-smoke-cntt-{tag}-sbom'
+
+- job-template:
+    name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-opnfv-functest-benchmarking-cntt-sbom'
+    <<: *functest-params
+    repo: 'opnfv'
+    container: 'functest-benchmarking-cntt'
+    port:
+    jobs:
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-sbom'
 
 - view:
     name: functest-docker
@@ -1704,7 +2624,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z0-9.]+-docker$
+    regex: ^functest-[a-z0-9.-]+-docker$
 
 - view:
     name: functest-trivy
@@ -1729,3 +2649,15 @@
       - last-failure
       - last-duration
     regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-grype$
+
+- view:
+    name: functest-sbom
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-sbom$