X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=a362de36070ed2f9e7daeb549a7fdf7ba3f35a60;hb=8e3a965ea9b4d0d8f174d212042e714a58080751;hp=8c7b7de7c4d1ee185aae7f6e1be3335bbd4e2c21;hpb=d4f4c17c522bc90602ddc9161f33ddc5452ebec9;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 8c7b7de7c..a362de360 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -15,43 +15,49 @@
           from:
           build_args:
           branch: master
-          slave: lf-virtual1-8
-          dependency: 3.14
-      - v1.22:
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
           from:
           build_args:
-          branch: stable/v1.22
-          slave: lf-virtual1-7
-          dependency: 3.14
-      - v1.21:
+          branch: master
+          node: lf-virtual1-1
+          dependency: 3.16
+      - v1.25:
           from:
           build_args:
-          branch: stable/v1.21
-          slave: lf-virtual1-6
-          dependency: 3.13
-      - leguer:
+          branch: stable/v1.25
+          node: lf-virtual1-8
+          dependency: 3.16
+      - v1.24:
           from:
           build_args:
-          branch: stable/leguer
-          slave: lf-virtual1-5
-          dependency: 3.12
-      - kali:
+          branch: stable/v1.24
+          node: lf-virtual1-7
+          dependency: 3.16
+      - v1.23:
           from:
           build_args:
-          branch: stable/kali
-          slave: lf-virtual1-4
-          dependency: 3.11
+          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-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
     current-parameters: true
 
 - parameter:
-    name: functest-kubernetes-slave
+    name: functest-kubernetes-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: functest-kubernetes-build_tag
@@ -66,13 +72,6 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
-- parameter:
-    name: functest-kubernetes-E2E_TEST_OPTS
-    parameters:
-      - string:
-          name: E2E_TEST_OPTS
-          default: container-runtime:containerd
-
 - functest-kubernetes-run-containers: &functest-kubernetes-run-containers
     name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
@@ -81,6 +80,9 @@
     volumes: '{volumes}'
     env: '{env}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
+    published_ports: '{published_ports}'
 
 - builder:
     name: functest-kubernetes-pull-containers
@@ -111,6 +113,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" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -119,18 +126,21 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           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/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            -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=$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
@@ -152,8 +162,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-pull-containers:
           <<: *functest-kubernetes-containers
@@ -196,8 +206,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-remove-images:
           <<: *functest-kubernetes-containers
@@ -240,14 +250,12 @@
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -257,29 +265,30 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
+    published_ports:
     container: 'functest-kubernetes-healthcheck'
     test:
       - k8s_quick
       - k8s_smoke
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
 
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -289,13 +298,13 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
+    published_ports:
     container: 'functest-kubernetes-smoke'
     test:
       - xrally_kubernetes
-      - k8s_io
       - k8s_conformance
       - k8s_conformance_serial
       - sig_api_machinery
@@ -312,27 +321,20 @@
       - sig_storage_serial
     privileged: 'false'
     network: bridge
-    exclude:
-      - tag: latest
-        test: k8s_io
-      - tag: v1.22
-        test: k8s_io
-      - tag: v1.21
-        test: k8s_io
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
 
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -342,9 +344,10 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
+    published_ports:
     container: 'functest-kubernetes-security'
     test:
       - kube_hunter
@@ -352,20 +355,20 @@
       - kube_bench_node
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
 
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -375,29 +378,30 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
+    published_ports:
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
       - netperf
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
 
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -407,9 +411,10 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
+    published_ports:
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
@@ -417,6 +422,8 @@
       - cnf_testsuite
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
 
@@ -435,6 +442,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" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -443,13 +455,16 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
             $volumes \
             $env \
+            $published_ports \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            -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 BUILD_TAG=$BUILD_TAG \
@@ -459,29 +474,33 @@
 - job-template:
     name: 'functest-kubernetes-{tag}-zip'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-zip:
           <<: *functest-kubernetes-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
+          published_ports: '{published_ports}'
 
 - project:
     name: 'functest-kubernetes-{tag}-zip'
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
+    published_ports:
     container: 'functest-kubernetes-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-{tag}-zip'
 
@@ -491,21 +510,20 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-docker$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -547,8 +565,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_io-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance_serial-run'
@@ -607,6 +623,12 @@
           projects:
             - name: 'functest-kubernetes-{tag}-zip'
               <<: *functest-kubernetes-jobs
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-daily'
@@ -709,8 +731,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-pull-dep-images:
           <<: *functest-kubernetes-dep
@@ -724,8 +746,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-remove-dep-images:
           <<: *functest-kubernetes-dep
@@ -741,17 +763,20 @@
     builders:
       - shell: |
           set +x
-          export DEPLOY_SCENARIO=k8-nosdn-nofeature-noha
-          export E2E_TEST_OPTS=container-runtime:containerd
-          apt-get update && DEBIAN_FRONTEND=noninteractive \
-          apt-get install software-properties-common gpg -y
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 dist-upgrade -y
+          DEBIAN_FRONTEND=noninteractive \
+          apt-get -o DPkg::Lock::Timeout=300 install software-properties-common gpg -y
           add-apt-repository -y ppa:deadsnakes/ppa
-          apt-get update && DEBIAN_FRONTEND=noninteractive \
-          apt-get install \
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          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
+            python3-pip enchant-2 -y
           pip3 install tox tox-pip-version
 
           tox
@@ -765,8 +790,8 @@
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-tox:
 
@@ -779,8 +804,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     scm:
       - functest-kubernetes-scm:
           ref: $GERRIT_REFSPEC
@@ -868,21 +893,20 @@
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-E2E_TEST_OPTS:
-          E2E_TEST_OPTS: container-runtime:containerd
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-docker$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -945,8 +969,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_io-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance_serial-run'
@@ -1000,6 +1022,12 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-review'
@@ -1054,8 +1082,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-build'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     scm:
       - functest-kubernetes-scm:
           ref: '{branch}'
@@ -1131,15 +1159,15 @@
       - functest-kubernetes-scm:
           ref: '{branch}'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -1176,15 +1204,20 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build'
               <<: *functest-kubernetes-jobs
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - builder:
     name: functest-kubernetes-trivy
     builders:
       - shell: |
-          export DEPLOY_SCENARIO=k8-nosdn-nofeature-noha
-          export E2E_TEST_OPTS=container-runtime:containerd
-          apt-get update && DEBIAN_FRONTEND=noninteractive \
-          apt-get install curl -y
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
 
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
           if [ "{repo}" = "_" ]; then
@@ -1194,18 +1227,24 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy --exit-code 1 $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - 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-core-trivy'
@@ -1249,6 +1288,83 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
 
+- builder:
+    name: functest-kubernetes-grype
+    builders:
+      - shell: |
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | 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: 'functest-kubernetes-{repo}-{container}-{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-core-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-core'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-healthcheck'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-cnf'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-security'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-smoke'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
 - project:
     name: 'functest-kubernetes'
     <<: *functest-kubernetes-params
@@ -1278,3 +1394,15 @@
       - last-failure
       - last-duration
     regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-trivy$
+
+- view:
+    name: functest-kubernetes-grype
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-grype$