X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting.yaml;h=fbd8ba4459df3a7d88d4184d2d2113527546cddd;hb=b6e44add9068ae8eb3fae4f3cdf06934c817b0d6;hp=f4ef35ea46f48306098b71d177babd0eb381df64;hpb=219801fef20c8cd1838328bd6a3c557092754a7c;p=releng.git

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index f4ef35ea4..fbd8ba445 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -8,56 +8,109 @@
 
 - xtesting-params: &xtesting-params
     name: 'xtesting-params'
-    repo: 'opnfv'
-    port:
     tag:
       - latest:
           from:
           build_args:
           branch: master
-          slave: lf-virtual1
-          dependency: 3.14
+          node: opnfv-build
+          dependency: 3.17
+      - 2023.2:
+          from:
+          build_args:
+          branch: stable/2023.2
+          node: opnfv-build
+          dependency: 3.17
+      - 2023.1:
+          from:
+          build_args:
+          branch: stable/2023.1
+          node: opnfv-build
+          dependency: 3.17
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: opnfv-build
+          dependency: 3.16
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: opnfv-build
+          dependency: 3.16
       - xena:
           from:
           build_args:
           branch: stable/xena
-          slave: lf-virtual1
+          node: opnfv-build
           dependency: 3.14
       - wallaby:
           from:
           build_args:
           branch: stable/wallaby
-          slave: lf-virtual1
+          node: opnfv-build
           dependency: 3.13
-      - leguer:
+
+- xtesting-opnfv-xtesting-params: &xtesting-opnfv-xtesting-params
+    name: 'xtesting-opnfv-xtesting-params'
+    repo: 'opnfv'
+    container: 'xtesting'
+    port:
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: opnfv-build
+          dependency: 3.17
+      - 2023.2:
+          from:
+          build_args:
+          branch: stable/2023.2
+          node: opnfv-build
+          dependency: 3.17
+      - 2023.1:
+          from:
+          build_args:
+          branch: stable/2023.1
+          node: opnfv-build
+          dependency: 3.17
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: opnfv-build
+          dependency: 3.16
+      - yoga:
           from:
           build_args:
-          branch: stable/leguer
-          slave: lf-virtual1
-          dependency: 3.12
-      - kali:
+          branch: stable/yoga
+          node: opnfv-build
+          dependency: 3.16
+      - xena:
           from:
           build_args:
-          branch: stable/kali
-          slave: lf-virtual1
-          dependency: 3.11
-      - jerma:
+          branch: stable/xena
+          node: opnfv-build
+          dependency: 3.14
+      - wallaby:
           from:
           build_args:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
+          branch: stable/wallaby
+          node: opnfv-build
+          dependency: 3.13
 
 - xtesting-jobs: &xtesting-jobs
     name: 'xtesting-jobs'
     current-parameters: true
 
 - parameter:
-    name: xtesting-slave
+    name: xtesting-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: xtesting-build_tag
@@ -68,11 +121,13 @@
 - xtesting-run-containers: &xtesting-run-containers
     name: 'xtesting-run-containers'
     <<: *xtesting-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
+    published_ports: '{published_ports}'
 
 - builder:
     name: xtesting-pull-containers
@@ -103,6 +158,11 @@
             for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
               do env="-e $i $env"; done
           fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -111,18 +171,21 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
             $volumes \
             $env \
+            $published_ports \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-            -v /home/opnfv/xtesting/.boto:/root/.boto \
+            -v /home/opnfv/xtesting/.boto:/etc/boto.cfg \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=$slave \
+            -e NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             $image run_tests -t {test} -p -r
@@ -142,67 +205,53 @@
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-pull'
+    name: 'xtesting-opnfv-xtesting-{tag}-pull'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     builders:
       - xtesting-pull-containers:
           <<: *xtesting-containers
 
 - project:
     name: 'xtesting-opnfv-xtesting-pull'
-    <<: *xtesting-params
-    container: 'xtesting'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-pull'
-
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-pull'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
+    <<: *xtesting-opnfv-xtesting-params
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-pull'
+      - 'xtesting-opnfv-xtesting-{tag}-pull'
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-rmi'
+    name: 'xtesting-opnfv-xtesting-{tag}-rmi'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     builders:
       - xtesting-remove-images:
           <<: *xtesting-containers
 
 - project:
     name: 'xtesting-opnfv-xtesting-rmi'
-    <<: *xtesting-params
-    container: 'xtesting'
+    <<: *xtesting-opnfv-xtesting-params
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-rmi'
-
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-rmi'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-rmi'
+      - 'xtesting-opnfv-xtesting-{tag}-rmi'
 
 - job-template:
     name: 'xtesting-opnfv-xtesting-{tag}-{test}-run'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
       - xtesting-build_tag:
           build_tag: ''
     builders:
       - xtesting-run-containers:
           <<: *xtesting-run-containers
+          test: '{test}'
 
 - project:
     name: 'xtesting-opnfv-xtesting'
-    <<: *xtesting-params
+    <<: *xtesting-opnfv-xtesting-params
     volumes:
     env:
+    published_ports:
     container: 'xtesting'
     test:
       - first
@@ -212,42 +261,19 @@
       - fifth
       - sixth
       - eighth
+      - nineth
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     exclude:
-      - tag: leguer
-        test: eighth
-      - tag: kali
-        test: eighth
-      - tag: jerma
-        test: eighth
+      - tag: wallaby
+        test: nineth
+      - tag: xena
+        test: nineth
     jobs:
       - 'xtesting-opnfv-xtesting-{tag}-{test}-run'
 
-- job-template:
-    name: 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
-    parameters:
-      - xtesting-slave:
-          slave: '{slave}'
-      - xtesting-build_tag:
-          build_tag: ''
-    builders:
-      - xtesting-run-containers:
-          <<: *xtesting-run-containers
-
-- project:
-    name: 'xtesting-opnfv-xtesting-mts'
-    <<: *xtesting-params
-    volumes:
-    env:
-    container: 'xtesting-mts'
-    test:
-      - seventh
-    privileged: 'false'
-    network: bridge
-    jobs:
-      - 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
-
 - builder:
     name: xtesting-zip
     builders:
@@ -263,6 +289,11 @@
             for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
               do env="-e $i $env"; done
           fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -271,15 +302,21 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
+            $published_ports \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
-            -v /home/opnfv/xtesting/.boto:/root/.boto \
+            -v /home/opnfv/xtesting/.boto:/etc/boto.cfg \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             $image zip_campaign
@@ -287,22 +324,25 @@
 - job-template:
     name: 'xtesting-{tag}-zip'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
       - xtesting-build_tag:
           build_tag: ''
     builders:
       - xtesting-zip:
-          <<: *xtesting-containers
-          volumes: '{volumes}'
-          env: '{env}'
+          <<: *xtesting-run-containers
 
 - project:
-    name: 'xtesting-{tag}-zip'
-    <<: *xtesting-params
+    name: 'xtesting-zip'
+    <<: *xtesting-opnfv-xtesting-params
     volumes:
     env:
+    published_ports:
     container: 'xtesting'
+    privileged: 'false'
+    network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'xtesting-{tag}-zip'
 
@@ -312,8 +352,8 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
       - xtesting-build_tag:
           build_tag: ''
     # PyYAML and yamllint differ here
@@ -330,15 +370,11 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
-              <<: *xtesting-jobs
       - multijob:
           name: pull containers
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-pull'
               <<: *xtesting-jobs
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-pull'
-              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
@@ -356,10 +392,7 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-eighth-run'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts:{tag}
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-nineth-run'
               <<: *xtesting-jobs
       - multijob:
           name: dump all campaign data
@@ -367,7 +400,10 @@
             - name: 'xtesting-{tag}-zip'
               <<: *xtesting-jobs
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
 - project:
@@ -386,7 +422,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-daily$
+    regex: ^xtesting-[a-z0-9.-]+-daily$
 
 - xtesting-build-containers: &xtesting-build-containers
     name: 'xtesting-build-containers'
@@ -436,67 +472,60 @@
 - xtesting-dep: &xtesting-dep
     name: 'xtesting-containers'
     repo: '{repo}'
+    container: '{container}'
     port: '{port}'
-    tag: '{tag}'
-    dependency: '{dependency}'
-
-- builder:
-    name: xtesting-pull-dep-images
-    builders:
-      - shell: |
-          set +x
-          if [ "_" = "_" ]; then
-            image=alpine:{dependency}
-          elif [ "" = "None" ]; then
-            image=_/alpine:{dependency}
-          else
-            image=_:/alpine:{dependency}
-          fi
-          sudo docker pull $image || true
-
-- builder:
-    name: xtesting-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: 'xtesting-{repo}-{tag}-dep-pull'
+    name: 'xtesting-{tag}-dep-pull'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     builders:
-      - xtesting-pull-dep-images:
+      - xtesting-pull-containers:
           <<: *xtesting-dep
 
+- xtesting-dep-params: &xtesting-dep-params
+    name: 'xtesting-dep-params'
+    repo: '_'
+    container: 'alpine'
+    port:
+    tag:
+      - latest:
+          dependency: 3.17
+      - 2023.2:
+          dependency: 3.17
+      - 2023.1:
+          dependency: 3.17
+      - zed:
+          dependency: 3.16
+      - yoga:
+          dependency: 3.16
+      - xena:
+          dependency: 3.14
+      - wallaby:
+          dependency: 3.13
+
 - project:
-    name: 'xtesting-{repo}-{tag}-dep-pull'
-    <<: *xtesting-params
+    name: 'xtesting-dep-pull'
+    <<: *xtesting-dep-params
     jobs:
-      - 'xtesting-{repo}-{tag}-dep-pull'
+      - 'xtesting-{tag}-dep-pull'
 
 - job-template:
-    name: 'xtesting-{repo}-{tag}-dep-rmi'
+    name: 'xtesting-{tag}-dep-rmi'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     builders:
-      - xtesting-remove-dep-images:
+      - xtesting-remove-images:
           <<: *xtesting-dep
 
 - project:
-    name: 'xtesting-{repo}-{tag}-dep-rmi'
-    <<: *xtesting-params
+    name: 'xtesting-dep-rmi'
+    <<: *xtesting-dep-params
     jobs:
-      - 'xtesting-{repo}-{tag}-dep-rmi'
+      - 'xtesting-{tag}-dep-rmi'
 
 - builder:
     name: xtesting-tox
@@ -512,11 +541,12 @@
           sudo apt-get -o DPkg::Lock::Timeout=300 update && \
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
+            libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
+            python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
-            python3.7 python3.7-dev python3.6 python3.6-dev \
-            python python-dev python3-pip enchant -y
-          sudo pip3 install tox tox-pip-version
+            python3-pip enchant-2 -y
+          sudo pip3 install tox
 
           tox
 
@@ -529,8 +559,8 @@
       - xtesting-patchset-created:
           branch: '{branch}'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     builders:
       - xtesting-tox:
 
@@ -541,10 +571,10 @@
       - 'xtesting-{tag}-tox'
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-gate'
+    name: 'xtesting-opnfv-xtesting-{tag}-gate'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     scm:
       - xtesting-scm:
           ref: $GERRIT_REFSPEC
@@ -555,22 +585,15 @@
           build_args: '{build_args}'
 
 - project:
-    name: xtesting-opnfv-xtesting-{tag}-gate
+    name: xtesting-opnfv-xtesting-gate
     <<: *xtesting-params
+    repo: opnfv
+    port:
     container: xtesting
     ref_arg: BRANCH
     path: docker/core
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-gate'
-
-- project:
-    name: xtesting-opnfv-xtesting-mts-{tag}-gate
-    <<: *xtesting-params
-    container: xtesting-mts
-    ref_arg: BRANCH
-    path: docker/mts
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-gate'
+      - 'xtesting-opnfv-xtesting-{tag}-gate'
 
 - trigger:
     name: xtesting-patchset-created
@@ -596,8 +619,8 @@
       - xtesting-patchset-created:
           branch: '{branch}'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
       - xtesting-build_tag:
           build_tag: ''
     # PyYAML and yamllint differ here
@@ -614,28 +637,21 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
-              <<: *xtesting-jobs
       - multijob:
           name: remove dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-rmi'
+            - name: 'xtesting-{tag}-dep-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-pull'
+            - name: 'xtesting-{tag}-dep-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-gate'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-gate'
-              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
@@ -653,13 +669,13 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-eighth-run'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts:{tag}
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-nineth-run'
               <<: *xtesting-jobs
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
 - project:
@@ -678,7 +694,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-review$
+    regex: ^xtesting-[a-z0-9.-]+-review$
 
 - view:
     name: xtesting-tox
@@ -690,7 +706,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-tox$
+    regex: ^xtesting-[a-z0-9.-]+-tox$
 
 - builder:
     name: xtesting-push-containers
@@ -713,10 +729,10 @@
           cron: "*/30 * * * *"
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-build'
+    name: 'xtesting-opnfv-xtesting-{tag}-build'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     scm:
       - xtesting-scm:
           ref: '{branch}'
@@ -730,22 +746,15 @@
           ref: '{branch}'
 
 - project:
-    name: xtesting-opnfv-xtesting-{tag}-build
+    name: xtesting-opnfv-xtesting-build
     <<: *xtesting-params
+    repo: opnfv
     container: xtesting
+    port:
     ref_arg: BRANCH
     path: docker/core
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-build'
-
-- project:
-    name: xtesting-opnfv-xtesting-mts-{tag}-build
-    <<: *xtesting-params
-    container: xtesting-mts
-    ref_arg: BRANCH
-    path: docker/mts
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-build'
+      - 'xtesting-opnfv-xtesting-{tag}-build'
 
 - job-template:
     name: 'xtesting-{tag}-docker'
@@ -756,8 +765,8 @@
       - xtesting-scm:
           ref: '{branch}'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
@@ -770,27 +779,31 @@
       - multijob:
           name: remove dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-rmi'
+            - name: 'xtesting-{tag}-dep-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-pull'
+            - name: 'xtesting-{tag}-dep-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-build'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-build'
-              <<: *xtesting-jobs
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
+- project:
+    name: 'xtesting-docker'
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{tag}-docker'
+
 - builder:
     name: xtesting-trivy
     builders:
@@ -807,41 +820,122 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy --exit-code 1 $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-trivy'
+    name: 'xtesting-opnfv-xtesting-{tag}-trivy'
     triggers:
       - timed: '@daily'
     parameters:
-      - xtesting-slave:
-          slave: '{slave}'
+      - xtesting-node:
+          node: '{node}'
     builders:
       - xtesting-trivy:
           <<: *xtesting-containers
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'xtesting-opnfv-xtesting-trivy'
     <<: *xtesting-params
+    repo: 'opnfv'
     container: 'xtesting'
+    port:
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-trivy'
+      - 'xtesting-opnfv-xtesting-{tag}-trivy'
+
+- builder:
+    name: xtesting-grype
+    builders:
+      - shell: |
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sudo sh -s -- -b .
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          ./grype -q $image
+
+- job-template:
+    name: 'xtesting-opnfv-xtesting-{tag}-grype'
+    triggers:
+      - timed: '@daily'
+    parameters:
+      - xtesting-node:
+          node: '{node}'
+    builders:
+      - xtesting-grype:
+          <<: *xtesting-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
-    name: 'xtesting-opnfv-xtesting-mts-trivy'
+    name: 'xtesting-opnfv-xtesting-grype'
     <<: *xtesting-params
-    container: 'xtesting-mts'
+    repo: 'opnfv'
+    container: 'xtesting'
+    port:
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-trivy'
+      - 'xtesting-opnfv-xtesting-{tag}-grype'
+
+- builder:
+    name: xtesting-sbom
+    builders:
+      - shell: |
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          sudo mkdir -p ~/.docker
+          curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sudo sh -s --
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker sbom $image
+
+- job-template:
+    name: 'xtesting-opnfv-xtesting-{tag}-sbom'
+    triggers:
+      - timed: '@daily'
+    parameters:
+      - xtesting-node:
+          node: '{node}'
+    builders:
+      - xtesting-sbom:
+          <<: *xtesting-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
-    name: 'xtesting'
+    name: 'xtesting-opnfv-xtesting-sbom'
     <<: *xtesting-params
+    repo: 'opnfv'
+    container: 'xtesting'
+    port:
     jobs:
-      - 'xtesting-{tag}-docker'
+      - 'xtesting-opnfv-xtesting-{tag}-sbom'
 
 - view:
     name: xtesting-docker
@@ -853,7 +947,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-docker$
+    regex: ^xtesting-[a-z0-9.-]+-docker$
 
 - view:
     name: xtesting-trivy
@@ -866,3 +960,27 @@
       - last-failure
       - last-duration
     regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-trivy$
+
+- view:
+    name: xtesting-grype
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-grype$
+
+- view:
+    name: xtesting-sbom
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-sbom$