Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Finish updating Jenkins jobs
[releng.git] / jjb / functest / functest.yaml
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 8e9de2d..1884e22 100644 (file)
--- 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-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-pull'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-pull-containers:
+          <<: *functest-containers
+
+- project:
+    name: 'functest-opnfv-functest-vnf-pull'
+    <<: *functest-opnfv-functest-vnf-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - 'functest-opnfv-functest-vnf-{tag}-pull'
+
+- job-template:
+    name: 'functest-opnfv-functest-vnf-{tag}-rmi'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-remove-images:
+          <<: *functest-containers
 
 - project:
     name: 'functest-opnfv-functest-vnf-rmi'
-    <<: *functest-params
-    container: 'functest-vnf'
+    <<: *functest-opnfv-functest-vnf-params
     jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
+      - 'functest-opnfv-functest-vnf-{tag}-rmi'
 
 - job-template:
     name: 'functest-opnfv-functest-healthcheck-{tag}-{test}-run'
@@ -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'
-
-- project:
-    name: functest-opnfv-functest-healthcheck-{tag}-build
-    <<: *functest-params
-    container: functest-healthcheck
-    ref_arg: BRANCH
-    path: docker/healthcheck
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
+      - 'functest-opnfv-functest-core-{tag}-build'
 
-- project:
-    name: functest-opnfv-functest-smoke-{tag}-build
-    <<: *functest-params
-    container: functest-smoke
-    ref_arg: BRANCH
+- 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-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