From 94894ae211bd21a309c46a7eb3c86118ae78b673 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 31 Oct 2023 14:42:06 +0100
Subject: Finish updating Jenkins jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I324814df4577d3ea2f8207b4b6cd13c86dd31e94
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-kubernetes.yaml | 1052 ++++++++++++++++++++++++++++-----
 1 file changed, 895 insertions(+), 157 deletions(-)

(limited to 'jjb/functest/functest-kubernetes.yaml')

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,42 @@
 
 - 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'
 
-- project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-smoke'
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{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-security-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
+    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'
 
-- project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-benchmarking'
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+- 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-cnf-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-cnf'
+    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-{repo}-{container}-{tag}-rmi'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
     parameters:
       - functest-kubernetes-node:
           node: '{node}'
@@ -213,39 +426,100 @@
           <<: *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-smoke-rmi'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+      - '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-smoke-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-smoke'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-security-params
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull'
 
-- project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{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-opnfv-functest-kubernetes-security-params
+    jobs:
+      - '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-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-benchmarking-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-benchmarking'
+    <<: *functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
+    jobs:
+      - '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-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,62 +1449,159 @@
 - 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'
-
-- project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build
-    <<: *functest-kubernetes-params
-    container: functest-kubernetes-benchmarking
-    ref_arg:
-    path: docker/benchmarking
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build'
 
 - job-template:
-    name: 'functest-kubernetes-{tag}-docker'
-    project-type: multijob
-    triggers:
-      - functest-kubernetes-commit
+    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-opnfv-functest-kubernetes-benchmarking-{tag}-build'
+
+- job-template:
+    name: 'functest-kubernetes-{tag}-docker'
+    project-type: multijob
+    triggers:
+      - functest-kubernetes-commit
     scm:
       - functest-kubernetes-scm:
           ref: '{branch}'
@@ -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
-- 
cgit 1.2.3-korg