Finish updating Jenkins jobs

Change-Id: I324814df4577d3ea2f8207b4b6cd13c86dd31e94
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

5 files changed, 2779 insertions, 445 deletions

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 3b16f68ea..73d3e0cc6 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -8,7 +8,220 @@
 
 - functest-kubernetes-pi-params: &functest-kubernetes-pi-params
     name: 'functest-kubernetes-pi-params'
+    tag:
+      - latest:
+          node: lf-virtual1-9
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-healthcheck'
+    port:
+    tag:
+      - latest:
+          node: lf-virtual1-9
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-smoke'
+    port:
+    tag:
+      - latest:
+          node: lf-virtual1-9
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-security-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-security'
+    port:
+    tag:
+      - latest:
+          node: lf-virtual1-9
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params'
     repo: 'ollivier'
+    container: 'functest-kubernetes-benchmarking'
+    port:
+    tag:
+      - latest:
+          node: lf-virtual1-9
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-cnf'
     port:
     tag:
       - latest:
@@ -75,7 +288,6 @@
 - functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
     name: 'functest-kubernetes-pi-run-containers'
     <<: *functest-kubernetes-pi-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -160,7 +372,7 @@
           docker rmi $image || true
 
 - job-template:
-    name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-pull'
     parameters:
       - functest-kubernetes-pi-node:
           node: '{node}'
@@ -170,41 +382,72 @@
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-healthcheck'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-smoke'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-security'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-benchmarking'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-cnf'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
 
 - job-template:
-    name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
     parameters:
       - functest-kubernetes-pi-node:
           node: '{node}'
@@ -213,39 +456,70 @@
           <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-healthcheck'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-smoke'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-security'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-benchmarking'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-cnf'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
 
 - job-template:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-{test}-run'
@@ -259,10 +533,11 @@
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -292,10 +567,11 @@
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -338,10 +614,11 @@
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -372,10 +649,11 @@
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -405,10 +683,11 @@
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -458,6 +737,8 @@
           mkdir -p $WORKSPACE/results
           chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
@@ -467,6 +748,7 @@
             -v /home/opnfv/functest-kubernetes/.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 \
             $image zip_campaign
@@ -482,16 +764,11 @@
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
     builders:
       - functest-kubernetes-pi-zip:
-          <<: *functest-kubernetes-pi-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *functest-kubernetes-pi-run-containers
 
 - project:
     name: 'functest-kubernetes-pi-{tag}-zip'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -499,6 +776,8 @@
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
     published_ports:
     container: 'functest-kubernetes-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
@@ -522,8 +801,7 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
-          - ^functest-kubernetes-(pi-)*{tag}-docker$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 2a1f229b4..8d4e2a79d 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -8,7 +8,220 @@
 
 - functest-kubernetes-params: &functest-kubernetes-params
     name: 'functest-kubernetes-params'
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
+          from:
+          build_args:
+          branch: stable/v1.26
+          node: lf-virtual1-1
+          dependency: 3.16
+      - v1.25:
+          from:
+          build_args:
+          branch: stable/v1.25
+          node: lf-virtual1-8
+          dependency: 3.16
+      - v1.24:
+          from:
+          build_args:
+          branch: stable/v1.24
+          node: lf-virtual1-7
+          dependency: 3.16
+      - v1.23:
+          from:
+          build_args:
+          branch: stable/v1.23
+          node: lf-virtual1-6
+          dependency: 3.14
+      - v1.22:
+          from:
+          build_args:
+          branch: stable/v1.22
+          node: lf-virtual1-5
+          dependency: 3.14
+
+- functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params: &functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params'
     repo: 'opnfv'
+    container: 'functest-kubernetes-healthcheck'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
+          from:
+          build_args:
+          branch: stable/v1.26
+          node: lf-virtual1-1
+          dependency: 3.16
+      - v1.25:
+          from:
+          build_args:
+          branch: stable/v1.25
+          node: lf-virtual1-8
+          dependency: 3.16
+      - v1.24:
+          from:
+          build_args:
+          branch: stable/v1.24
+          node: lf-virtual1-7
+          dependency: 3.16
+      - v1.23:
+          from:
+          build_args:
+          branch: stable/v1.23
+          node: lf-virtual1-6
+          dependency: 3.14
+      - v1.22:
+          from:
+          build_args:
+          branch: stable/v1.22
+          node: lf-virtual1-5
+          dependency: 3.14
+
+- functest-kubernetes-opnfv-functest-kubernetes-smoke-params: &functest-kubernetes-opnfv-functest-kubernetes-smoke-params
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-params'
+    repo: 'opnfv'
+    container: 'functest-kubernetes-smoke'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
+          from:
+          build_args:
+          branch: stable/v1.26
+          node: lf-virtual1-1
+          dependency: 3.16
+      - v1.25:
+          from:
+          build_args:
+          branch: stable/v1.25
+          node: lf-virtual1-8
+          dependency: 3.16
+      - v1.24:
+          from:
+          build_args:
+          branch: stable/v1.24
+          node: lf-virtual1-7
+          dependency: 3.16
+      - v1.23:
+          from:
+          build_args:
+          branch: stable/v1.23
+          node: lf-virtual1-6
+          dependency: 3.14
+      - v1.22:
+          from:
+          build_args:
+          branch: stable/v1.22
+          node: lf-virtual1-5
+          dependency: 3.14
+
+- functest-kubernetes-opnfv-functest-kubernetes-security-params: &functest-kubernetes-opnfv-functest-kubernetes-security-params
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-params'
+    repo: 'opnfv'
+    container: 'functest-kubernetes-security'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
+          from:
+          build_args:
+          branch: stable/v1.26
+          node: lf-virtual1-1
+          dependency: 3.16
+      - v1.25:
+          from:
+          build_args:
+          branch: stable/v1.25
+          node: lf-virtual1-8
+          dependency: 3.16
+      - v1.24:
+          from:
+          build_args:
+          branch: stable/v1.24
+          node: lf-virtual1-7
+          dependency: 3.16
+      - v1.23:
+          from:
+          build_args:
+          branch: stable/v1.23
+          node: lf-virtual1-6
+          dependency: 3.14
+      - v1.22:
+          from:
+          build_args:
+          branch: stable/v1.22
+          node: lf-virtual1-5
+          dependency: 3.14
+
+- functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params: &functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params'
+    repo: 'opnfv'
+    container: 'functest-kubernetes-benchmarking'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
+          from:
+          build_args:
+          branch: stable/v1.26
+          node: lf-virtual1-1
+          dependency: 3.16
+      - v1.25:
+          from:
+          build_args:
+          branch: stable/v1.25
+          node: lf-virtual1-8
+          dependency: 3.16
+      - v1.24:
+          from:
+          build_args:
+          branch: stable/v1.24
+          node: lf-virtual1-7
+          dependency: 3.16
+      - v1.23:
+          from:
+          build_args:
+          branch: stable/v1.23
+          node: lf-virtual1-6
+          dependency: 3.14
+      - v1.22:
+          from:
+          build_args:
+          branch: stable/v1.22
+          node: lf-virtual1-5
+          dependency: 3.14
+
+- functest-kubernetes-opnfv-functest-kubernetes-cnf-params: &functest-kubernetes-opnfv-functest-kubernetes-cnf-params
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-params'
+    repo: 'opnfv'
+    container: 'functest-kubernetes-cnf'
     port:
     tag:
       - latest:
@@ -75,7 +288,6 @@
 - functest-kubernetes-run-containers: &functest-kubernetes-run-containers
     name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -160,7 +372,7 @@
           docker rmi $image || true
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-pull'
     parameters:
       - functest-kubernetes-node:
           node: '{node}'
@@ -170,41 +382,72 @@
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-healthcheck'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-remove-images:
+          <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-smoke'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-rmi'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pull-containers:
+          <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-pull'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-remove-images:
+          <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-benchmarking'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-rmi'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pull-containers:
+          <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-cnf'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-security-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull'
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
     parameters:
       - functest-kubernetes-node:
           node: '{node}'
@@ -213,39 +456,70 @@
           <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-healthcheck'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-security-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-pull'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pull-containers:
+          <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-smoke'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-remove-images:
+          <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pull-containers:
+          <<: *functest-kubernetes-containers
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-benchmarking'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-cnf-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-remove-images:
+          <<: *functest-kubernetes-containers
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-cnf'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-cnf-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
 
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
@@ -259,10 +533,11 @@
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck'
-    <<: *functest-kubernetes-params
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -292,10 +567,11 @@
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke'
-    <<: *functest-kubernetes-params
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -338,10 +614,11 @@
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security'
-    <<: *functest-kubernetes-params
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-security-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -372,10 +649,11 @@
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking'
-    <<: *functest-kubernetes-params
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -405,10 +683,11 @@
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
-    <<: *functest-kubernetes-params
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-cnf-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -458,6 +737,8 @@
           mkdir -p $WORKSPACE/results
           chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
@@ -467,6 +748,7 @@
             -v /home/opnfv/functest-kubernetes/.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 \
             $image zip_campaign
@@ -482,16 +764,11 @@
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
     builders:
       - functest-kubernetes-zip:
-          <<: *functest-kubernetes-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *functest-kubernetes-run-containers
 
 - project:
     name: 'functest-kubernetes-{tag}-zip'
-    <<: *functest-kubernetes-params
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
       - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
@@ -499,6 +776,8 @@
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
     published_ports:
     container: 'functest-kubernetes-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
@@ -522,8 +801,7 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
-          - ^functest-kubernetes-(pi-)*{tag}-docker$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -646,7 +924,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z0-9.]+-daily$
+    regex: ^functest-kubernetes-[a-z0-9.-]+-daily$
 
 - functest-kubernetes-build-containers: &functest-kubernetes-build-containers
     name: 'functest-kubernetes-build-containers'
@@ -696,67 +974,58 @@
 - functest-kubernetes-dep: &functest-kubernetes-dep
     name: 'functest-kubernetes-containers'
     repo: '{repo}'
+    container: '{container}'
     port: '{port}'
-    tag: '{tag}'
-    dependency: '{dependency}'
-
-- builder:
-    name: functest-kubernetes-pull-dep-images
-    builders:
-      - shell: |
-          set +x
-          if [ "_" = "_" ]; then
-            image=alpine:{dependency}
-          elif [ "None" = "None" ]; then
-            image=_/alpine:{dependency}
-          else
-            image=_:/alpine:{dependency}
-          fi
-          docker pull $image || true
-
-- builder:
-    name: functest-kubernetes-remove-dep-images
-    builders:
-      - shell: |
-          set +x
-          if [ "_" = "_" ]; then
-            image=alpine:{dependency}
-          elif [ "" = "None" ]; then
-            image=_/alpine:{dependency}
-          else
-            image=_:/alpine:{dependency}
-          fi
-          docker rmi $image || true
+    tag: '{dependency}'
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
+    name: 'functest-kubernetes-{tag}-dep-pull'
     parameters:
       - functest-kubernetes-node:
           node: '{node}'
     builders:
-      - functest-kubernetes-pull-dep-images:
+      - functest-kubernetes-pull-containers:
           <<: *functest-kubernetes-dep
 
+- functest-kubernetes-dep-params: &functest-kubernetes-dep-params
+    name: 'functest-kubernetes-dep-params'
+    repo: '_'
+    container: 'alpine'
+    port:
+    tag:
+      - latest:
+          dependency: 3.16
+      - v1.26:
+          dependency: 3.16
+      - v1.25:
+          dependency: 3.16
+      - v1.24:
+          dependency: 3.16
+      - v1.23:
+          dependency: 3.14
+      - v1.22:
+          dependency: 3.14
+
 - project:
-    name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
-    <<: *functest-kubernetes-params
+    name: 'functest-kubernetes-{tag}-dep-pull'
+    <<: *functest-kubernetes-dep-params
     jobs:
-      - 'functest-kubernetes-{repo}-{tag}-dep-pull'
+      - 'functest-kubernetes-{tag}-dep-pull'
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
+    name: 'functest-kubernetes-{tag}-dep-rmi'
     parameters:
       - functest-kubernetes-node:
           node: '{node}'
     builders:
-      - functest-kubernetes-remove-dep-images:
+      - functest-kubernetes-remove-images:
           <<: *functest-kubernetes-dep
 
 - project:
-    name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
-    <<: *functest-kubernetes-params
+    name: 'functest-kubernetes-{tag}-dep-rmi'
+    <<: *functest-kubernetes-dep-params
     jobs:
-      - 'functest-kubernetes-{repo}-{tag}-dep-rmi'
+      - 'functest-kubernetes-{tag}-dep-rmi'
 
 - builder:
     name: functest-kubernetes-tox
@@ -802,7 +1071,7 @@
       - 'functest-kubernetes-{tag}-tox'
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate'
     parameters:
       - functest-kubernetes-node:
           node: '{node}'
@@ -818,56 +1087,138 @@
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate
     <<: *functest-kubernetes-params
+    repo: opnfv
+    port:
     container: functest-kubernetes-core
     ref_arg: BRANCH
     path: docker/core
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate
     <<: *functest-kubernetes-params
+    repo: opnfv
+    port:
     container: functest-kubernetes-healthcheck
     ref_arg:
     path: docker/healthcheck
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate
     <<: *functest-kubernetes-params
+    repo: opnfv
+    port:
     container: functest-kubernetes-cnf
     ref_arg: BRANCH
     path: docker/cnf
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate
     <<: *functest-kubernetes-params
+    repo: opnfv
+    port:
     container: functest-kubernetes-security
     ref_arg: BRANCH
     path: docker/security
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate
     <<: *functest-kubernetes-params
+    repo: opnfv
+    port:
     container: functest-kubernetes-smoke
     ref_arg:
     path: docker/smoke
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: $GERRIT_REFSPEC
+          build_args: '{build_args}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate
     <<: *functest-kubernetes-params
+    repo: opnfv
+    port:
     container: functest-kubernetes-benchmarking
     ref_arg:
     path: docker/benchmarking
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate'
 
 - trigger:
     name: functest-kubernetes-patchset-created
@@ -905,8 +1256,7 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
-          - ^functest-kubernetes-(pi-)*{tag}-docker$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -925,12 +1275,12 @@
       - multijob:
           name: remove dependency
           projects:
-            - name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
+            - name: 'functest-kubernetes-{tag}-dep-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
+            - name: 'functest-kubernetes-{tag}-dep-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -1045,7 +1395,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z0-9.]+-review$
+    regex: ^functest-kubernetes-[a-z0-9.-]+-review$
 
 - view:
     name: functest-kubernetes-tox
@@ -1057,7 +1407,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z0-9.]+-tox$
+    regex: ^functest-kubernetes-[a-z0-9.-]+-tox$
 
 - builder:
     name: functest-kubernetes-push-containers
@@ -1080,7 +1430,7 @@
           cron: "*/30 * * * *"
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-build'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-build'
     parameters:
       - functest-kubernetes-node:
           node: '{node}'
@@ -1099,56 +1449,153 @@
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-build
     <<: *functest-kubernetes-params
+    repo: opnfv
     container: functest-kubernetes-core
+    port:
     ref_arg: BRANCH
     path: docker/core
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-build'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: '{branch}'
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-kubernetes-push-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build
     <<: *functest-kubernetes-params
+    repo: opnfv
     container: functest-kubernetes-healthcheck
+    port:
     ref_arg:
     path: docker/healthcheck
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: '{branch}'
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-kubernetes-push-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build
     <<: *functest-kubernetes-params
+    repo: opnfv
     container: functest-kubernetes-cnf
+    port:
     ref_arg: BRANCH
     path: docker/cnf
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: '{branch}'
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-kubernetes-push-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build
     <<: *functest-kubernetes-params
+    repo: opnfv
     container: functest-kubernetes-security
+    port:
     ref_arg: BRANCH
     path: docker/security
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: '{branch}'
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-kubernetes-push-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build
     <<: *functest-kubernetes-params
+    repo: opnfv
     container: functest-kubernetes-smoke
+    port:
     ref_arg:
     path: docker/smoke
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: '{branch}'
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
+          build_args: '{build_args}'
+      - functest-kubernetes-push-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build
     <<: *functest-kubernetes-params
+    repo: opnfv
     container: functest-kubernetes-benchmarking
+    port:
     ref_arg:
     path: docker/benchmarking
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build'
 
 - job-template:
     name: 'functest-kubernetes-{tag}-docker'
@@ -1167,18 +1614,18 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove dependency
           projects:
-            - name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
+            - name: 'functest-kubernetes-{tag}-dep-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
+            - name: 'functest-kubernetes-{tag}-dep-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -1230,7 +1677,7 @@
           ./trivy image --exit-code 1 $image
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-trivy'
     triggers:
       - timed: '@weekly'
     parameters:
@@ -1249,44 +1696,141 @@
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-core-trivy'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-core'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-trivy'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-trivy:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-trivy'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-healthcheck'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-trivy'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-trivy:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-trivy'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-cnf'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-trivy'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-trivy:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-trivy'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-security'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-trivy'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-trivy:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-trivy'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-smoke'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-trivy'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-trivy:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-trivy'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-benchmarking'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-trivy'
 
 - builder:
     name: functest-kubernetes-grype
@@ -1307,7 +1851,7 @@
           ./grype -q $image
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-grype'
     triggers:
       - timed: '@weekly'
     parameters:
@@ -1326,44 +1870,141 @@
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-core-grype'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-core'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-grype'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-grype:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-grype'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-healthcheck'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-grype'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-grype:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-grype'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-cnf'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-grype'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-grype:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-grype'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-security'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-grype'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-grype:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-grype'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-smoke'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-grype'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-grype:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-grype'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-benchmarking'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-grype'
 
 - builder:
     name: functest-kubernetes-sbom
@@ -1385,7 +2026,7 @@
           docker sbom $image
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-sbom'
     triggers:
       - timed: '@weekly'
     parameters:
@@ -1404,44 +2045,141 @@
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-core-sbom'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-core'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-sbom'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-sbom:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-sbom'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-healthcheck'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-sbom'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-sbom:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-sbom'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-cnf'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-sbom'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-sbom:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-sbom'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-security'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-sbom'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-sbom:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-sbom'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-smoke'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sbom'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-sbom:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-sbom'
     <<: *functest-kubernetes-params
+    repo: 'opnfv'
     container: 'functest-kubernetes-benchmarking'
+    port:
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-sbom'
 
 - project:
     name: 'functest-kubernetes'
@@ -1459,7 +2197,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z0-9.]+-docker$
+    regex: ^functest-kubernetes-[a-z0-9.-]+-docker$
 
 - view:
     name: functest-kubernetes-trivy
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index f05e2567e..f9a5ab5ed 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -8,7 +8,317 @@
 
 - functest-pi-params: &functest-pi-params
     name: 'functest-pi-params'
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-healthcheck-params: &functest-pi-ollivier-functest-healthcheck-params
+    name: 'functest-pi-ollivier-functest-healthcheck-params'
+    repo: 'ollivier'
+    container: 'functest-healthcheck'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-smoke-params: &functest-pi-ollivier-functest-smoke-params
+    name: 'functest-pi-ollivier-functest-smoke-params'
+    repo: 'ollivier'
+    container: 'functest-smoke'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-smoke-cntt-params: &functest-pi-ollivier-functest-smoke-cntt-params
+    name: 'functest-pi-ollivier-functest-smoke-cntt-params'
+    repo: 'ollivier'
+    container: 'functest-smoke-cntt'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-benchmarking-params: &functest-pi-ollivier-functest-benchmarking-params
+    name: 'functest-pi-ollivier-functest-benchmarking-params'
     repo: 'ollivier'
+    container: 'functest-benchmarking'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-benchmarking-cntt-params: &functest-pi-ollivier-functest-benchmarking-cntt-params
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-params'
+    repo: 'ollivier'
+    container: 'functest-benchmarking-cntt'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-vnf-params: &functest-pi-ollivier-functest-vnf-params
+    name: 'functest-pi-ollivier-functest-vnf-params'
+    repo: 'ollivier'
+    container: 'functest-vnf'
     port:
     tag:
       - latest:
@@ -98,7 +408,6 @@
 - functest-pi-run-containers: &functest-pi-run-containers
     name: 'functest-pi-run-containers'
     <<: *functest-pi-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -185,7 +494,7 @@
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'functest-pi-{repo}-{container}-{tag}-pull'
+    name: 'functest-pi-ollivier-functest-healthcheck-{tag}-pull'
     parameters:
       - functest-pi-node:
           node: '{node}'
@@ -195,48 +504,72 @@
 
 - project:
     name: 'functest-pi-ollivier-functest-healthcheck-pull'
-    <<: *functest-pi-params
-    container: 'functest-healthcheck'
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-healthcheck-{tag}-pull'
 
-- project:
-    name: 'functest-pi-ollivier-functest-smoke-pull'
-    <<: *functest-pi-params
-    container: 'functest-smoke'
-    jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+- job-template:
+    name: 'functest-pi-ollivier-functest-healthcheck-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-smoke-cntt-pull'
-    <<: *functest-pi-params
-    container: 'functest-smoke-cntt'
+    name: 'functest-pi-ollivier-functest-healthcheck-rmi'
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-healthcheck-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-benchmarking-pull'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking'
+    name: 'functest-pi-ollivier-functest-smoke-pull'
+    <<: *functest-pi-ollivier-functest-smoke-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-smoke-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-benchmarking-cntt-pull'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking-cntt'
+    name: 'functest-pi-ollivier-functest-smoke-rmi'
+    <<: *functest-pi-ollivier-functest-smoke-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-smoke-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-vnf-pull'
-    <<: *functest-pi-params
-    container: 'functest-vnf'
+    name: 'functest-pi-ollivier-functest-smoke-cntt-pull'
+    <<: *functest-pi-ollivier-functest-smoke-cntt-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-smoke-cntt-{tag}-pull'
 
 - job-template:
-    name: 'functest-pi-{repo}-{container}-{tag}-rmi'
+    name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-rmi'
     parameters:
       - functest-pi-node:
           node: '{node}'
@@ -245,46 +578,100 @@
           <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-healthcheck-rmi'
-    <<: *functest-pi-params
-    container: 'functest-healthcheck'
+    name: 'functest-pi-ollivier-functest-smoke-cntt-rmi'
+    <<: *functest-pi-ollivier-functest-smoke-cntt-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-smoke-cntt-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-smoke-rmi'
-    <<: *functest-pi-params
-    container: 'functest-smoke'
+    name: 'functest-pi-ollivier-functest-benchmarking-pull'
+    <<: *functest-pi-ollivier-functest-benchmarking-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-benchmarking-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-smoke-cntt-rmi'
-    <<: *functest-pi-params
-    container: 'functest-smoke-cntt'
+    name: 'functest-pi-ollivier-functest-benchmarking-rmi'
+    <<: *functest-pi-ollivier-functest-benchmarking-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-benchmarking-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-benchmarking-rmi'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking'
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-pull'
+    <<: *functest-pi-ollivier-functest-benchmarking-cntt-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking-cntt-rmi'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking-cntt'
+    <<: *functest-pi-ollivier-functest-benchmarking-cntt-params
+    jobs:
+      - 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-vnf-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
+
+- project:
+    name: 'functest-pi-ollivier-functest-vnf-pull'
+    <<: *functest-pi-ollivier-functest-vnf-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-vnf-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-vnf-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-vnf-rmi'
-    <<: *functest-pi-params
-    container: 'functest-vnf'
+    <<: *functest-pi-ollivier-functest-vnf-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-vnf-{tag}-rmi'
 
 - job-template:
     name: 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run'
@@ -302,10 +689,11 @@
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-healthcheck'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -352,10 +740,11 @@
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-smoke'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-smoke-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -407,10 +796,11 @@
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-smoke-cntt'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-smoke-cntt-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -452,10 +842,11 @@
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-benchmarking-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -493,10 +884,11 @@
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking-cntt'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-benchmarking-cntt-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -532,10 +924,11 @@
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-vnf'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-vnf-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -589,6 +982,8 @@
           sudo mkdir -p $WORKSPACE/results
           sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
@@ -598,8 +993,10 @@
             -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:
@@ -617,16 +1014,11 @@
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     builders:
       - functest-pi-zip:
-          <<: *functest-pi-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *functest-pi-run-containers
 
 - project:
     name: 'functest-pi-{tag}-zip'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
@@ -636,6 +1028,8 @@
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     published_ports:
     container: 'functest-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 8e9de2d26..1884e2209 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -8,7 +8,257 @@
 
 - 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:
@@ -88,7 +338,6 @@
 - functest-run-containers: &functest-run-containers
     name: 'functest-run-containers'
     <<: *functest-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -175,7 +424,7 @@
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-pull'
+    name: 'functest-opnfv-functest-healthcheck-{tag}-pull'
     parameters:
       - functest-node:
           node: '{node}'
@@ -185,48 +434,72 @@
 
 - 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-node:
           node: '{node}'
@@ -235,46 +508,100 @@
           <<: *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'
+
+- 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-smoke-cntt-rmi'
-    <<: *functest-params
-    container: 'functest-smoke-cntt'
+    name: 'functest-opnfv-functest-benchmarking-rmi'
+    <<: *functest-opnfv-functest-benchmarking-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - '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-rmi'
-    <<: *functest-params
-    container: 'functest-benchmarking'
+    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-{repo}-{container}-{tag}-rmi'
+      - '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-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'
@@ -292,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
@@ -342,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
@@ -397,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
@@ -442,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
@@ -483,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
@@ -522,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
@@ -579,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 \
@@ -588,8 +923,10 @@
             -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:
@@ -607,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
+    <<: *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
@@ -626,6 +958,8 @@
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     published_ports:
     container: 'functest-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
@@ -832,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'
@@ -882,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-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-{tag}-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-node:
           node: '{node}'
     builders:
-      - functest-remove-dep-images:
+      - functest-remove-images:
           <<: *functest-dep
 
 - project:
-    name: 'functest-{repo}-{tag}-dep-rmi'
-    <<: *functest-params
+    name: 'functest-{tag}-dep-rmi'
+    <<: *functest-dep-params
     jobs:
-      - 'functest-{repo}-{tag}-dep-rmi'
+      - 'functest-{tag}-dep-rmi'
 
 - builder:
     name: functest-tox
@@ -988,7 +1311,7 @@
       - 'functest-{tag}-tox'
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-gate'
+    name: 'functest-opnfv-functest-core-{tag}-gate'
     parameters:
       - functest-node:
           node: '{node}'
@@ -1004,65 +1327,163 @@
 - project:
     name: functest-opnfv-functest-core-{tag}-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'
+
+- 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
     <<: *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
     <<: *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
     <<: *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
     <<: *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
     <<: *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
     <<: *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
@@ -1125,12 +1546,12 @@
       - 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
@@ -1296,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
@@ -1308,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
@@ -1331,7 +1752,7 @@
           cron: "*/30 * * * *"
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-build'
+    name: 'functest-opnfv-functest-core-{tag}-build'
     parameters:
       - functest-node:
           node: '{node}'
@@ -1350,65 +1771,181 @@
 - project:
     name: functest-opnfv-functest-core-{tag}-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'
+
+- 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
     <<: *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
     <<: *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
     <<: *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
     <<: *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
     <<: *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'
+
+- 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-{tag}-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'
@@ -1433,12 +1970,12 @@
       - 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
@@ -1489,7 +2026,7 @@
           ./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:
@@ -1508,51 +2045,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'
+
+- 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
@@ -1573,7 +2226,7 @@
           ./grype -q $image
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-grype'
+    name: 'functest-opnfv-functest-core-{tag}-grype'
     triggers:
       - timed: '@weekly'
     parameters:
@@ -1592,51 +2245,167 @@
 - 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'
+
+- 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-{repo}-{container}-{tag}-grype'
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-grype'
 
 - builder:
     name: functest-sbom
@@ -1658,7 +2427,7 @@
           sudo docker sbom $image
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-sbom'
+    name: 'functest-opnfv-functest-core-{tag}-sbom'
     triggers:
       - timed: '@weekly'
     parameters:
@@ -1677,51 +2446,167 @@
 - project:
     name: 'functest-opnfv-functest-core-sbom'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-core'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-sbom'
+      - '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-opnfv-functest-healthcheck-sbom'
     <<: *functest-params
+    repo: 'opnfv'
     container: 'functest-healthcheck'
+    port:
     jobs:
-      - 'functest-{repo}-{container}-{tag}-sbom'
+      - '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-{repo}-{container}-{tag}-sbom'
+      - '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-{repo}-{container}-{tag}-sbom'
+      - '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-{repo}-{container}-{tag}-sbom'
+      - '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-{repo}-{container}-{tag}-sbom'
+      - '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-{repo}-{container}-{tag}-sbom'
+      - 'functest-opnfv-functest-benchmarking-cntt-{tag}-sbom'
 
 - project:
     name: 'functest'
@@ -1739,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
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index f7d5e77dc..ecb3cdca4 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -8,45 +8,86 @@
 
 - xtesting-pi-params: &xtesting-pi-params
     name: 'xtesting-pi-params'
+    tag:
+      - latest:
+          node: opnfv-build
+      - 2023.1:
+          node: opnfv-build
+      - zed:
+          node: opnfv-build
+      - yoga:
+          node: opnfv-build
+      - xena:
+          node: opnfv-build
+      - wallaby:
+          node: opnfv-build
+      - arm-latest:
+          node: opnfv-build
+      - arm-2.23.1:
+          node: opnfv-build
+      - arm-zed:
+          node: opnfv-build
+      - arm-yoga:
+          node: opnfv-build
+      - arm-xena:
+          node: opnfv-build
+      - arm-wallaby:
+          node: opnfv-build
+      - arm64-latest:
+          node: opnfv-build
+      - arm64-2023.1:
+          node: opnfv-build
+      - arm64-zed:
+          node: opnfv-build
+      - arm64-yoga:
+          node: opnfv-build
+      - arm64-xena:
+          node: opnfv-build
+      - arm64-wallaby:
+          node: opnfv-build
+
+- xtesting-pi-ollivier-xtesting-params: &xtesting-pi-ollivier-xtesting-params
+    name: 'xtesting-pi-ollivier-xtesting-params'
     repo: 'ollivier'
+    container: 'xtesting'
     port:
     tag:
       - latest:
-          node: xtesting
+          node: opnfv-build
       - 2023.1:
-          node: xtesting
+          node: opnfv-build
       - zed:
-          node: xtesting
+          node: opnfv-build
       - yoga:
-          node: xtesting
+          node: opnfv-build
       - xena:
-          node: xtesting
+          node: opnfv-build
       - wallaby:
-          node: xtesting
+          node: opnfv-build
       - arm-latest:
-          node: xtesting
+          node: opnfv-build
       - arm-2.23.1:
-          node: xtesting
+          node: opnfv-build
       - arm-zed:
-          node: xtesting
+          node: opnfv-build
       - arm-yoga:
-          node: xtesting
+          node: opnfv-build
       - arm-xena:
-          node: xtesting
+          node: opnfv-build
       - arm-wallaby:
-          node: xtesting
+          node: opnfv-build
       - arm64-latest:
-          node: xtesting
+          node: opnfv-build
       - arm64-2023.1:
-          node: xtesting
+          node: opnfv-build
       - arm64-zed:
-          node: xtesting
+          node: opnfv-build
       - arm64-yoga:
-          node: xtesting
+          node: opnfv-build
       - arm64-xena:
-          node: xtesting
+          node: opnfv-build
       - arm64-wallaby:
-          node: xtesting
+          node: opnfv-build
 
 - xtesting-pi-jobs: &xtesting-pi-jobs
     name: 'xtesting-pi-jobs'
@@ -68,7 +109,6 @@
 - xtesting-pi-run-containers: &xtesting-pi-run-containers
     name: 'xtesting-pi-run-containers'
     <<: *xtesting-pi-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -153,7 +193,7 @@
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
+    name: 'xtesting-pi-ollivier-xtesting-{tag}-pull'
     parameters:
       - xtesting-pi-node:
           node: '{node}'
@@ -163,13 +203,12 @@
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting-pull'
-    <<: *xtesting-pi-params
-    container: 'xtesting'
+    <<: *xtesting-pi-ollivier-xtesting-params
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-pull'
+      - 'xtesting-pi-ollivier-xtesting-{tag}-pull'
 
 - job-template:
-    name: 'xtesting-pi-{repo}-{container}-{tag}-rmi'
+    name: 'xtesting-pi-ollivier-xtesting-{tag}-rmi'
     parameters:
       - xtesting-pi-node:
           node: '{node}'
@@ -179,10 +218,9 @@
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting-rmi'
-    <<: *xtesting-pi-params
-    container: 'xtesting'
+    <<: *xtesting-pi-ollivier-xtesting-params
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-rmi'
+      - 'xtesting-pi-ollivier-xtesting-{tag}-rmi'
 
 - job-template:
     name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
@@ -194,10 +232,11 @@
     builders:
       - xtesting-pi-run-containers:
           <<: *xtesting-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting'
-    <<: *xtesting-pi-params
+    <<: *xtesting-pi-ollivier-xtesting-params
     volumes:
     env:
     published_ports:
@@ -254,6 +293,8 @@
           sudo mkdir -p $WORKSPACE/results
           sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
@@ -263,6 +304,7 @@
             -v /home/opnfv/xtesting/.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 \
             $image zip_campaign
@@ -276,20 +318,17 @@
           build_tag: ''
     builders:
       - xtesting-pi-zip:
-          <<: *xtesting-pi-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *xtesting-pi-run-containers
 
 - project:
     name: 'xtesting-pi-{tag}-zip'
-    <<: *xtesting-pi-params
+    <<: *xtesting-pi-ollivier-xtesting-params
     volumes:
     env:
     published_ports:
     container: 'xtesting'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs: