X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=03920591f9901fb2fad0f2a2b0501b3d0dc29d07;hb=f7aa2d505c16d5ef756f0f0ff3d8e8c447e7cfac;hp=364163e39d5fe126b3a1b5e1473ff4fa95ad2b49;hpb=0c108ad88bad281eaea677419969d5dc0e641517;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 364163e39..03920591f 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -1,7 +1,10 @@
 ---
-- functest-kubernetes-jobs: &functest-kubernetes-jobs
-    name: 'functest-kubernetes-jobs'
-    current-parameters: true
+- functest-kubernetes-containers: &functest-kubernetes-containers
+    name: 'functest-kubernetes-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - functest-kubernetes-params: &functest-kubernetes-params
     name: 'functest-kubernetes-params'
@@ -9,35 +12,33 @@
     port:
     tag:
       - latest:
+          from:
+          buildargs:
           branch: master
+          slave: lf-virtual1-6
+          dependency: 3.13
+      - v1.21:
+          from:
+          buildargs:
+          branch: stable/v1.21
+          slave: lf-virtual1-6
+          dependency: 3.13
+      - leguer:
+          from:
+          buildargs:
+          branch: stable/leguer
           slave: lf-virtual1-5
+          dependency: 3.12
       - kali:
+          from:
+          buildargs:
           branch: stable/kali
           slave: lf-virtual1-4
-      - jerma:
-          branch: stable/jerma
-          slave: lf-virtual1-3
-      - iruya:
-          branch: stable/iruya
-          slave: lf-virtual1-2
-      - hunter:
-          branch: stable/hunter
-          slave: lf-virtual1-1
-      - arm64-latest:
-          branch: master
-          slave: lf-virtual1-5
-      - arm64-kali:
-          branch: stable/kali
-          slave: lf-virtual1-4
-      - arm64-jerma:
-          branch: stable/jerma
-          slave: lf-virtual1-3
-      - arm64-iruya:
-          branch: stable/iruya
-          slave: lf-virtual1-2
-      - arm64-hunter:
-          branch: stable/hunter
-          slave: lf-virtual1-1
+          dependency: 3.11
+
+- functest-kubernetes-jobs: &functest-kubernetes-jobs
+    name: 'functest-kubernetes-jobs'
+    current-parameters: true
 
 - parameter:
     name: functest-kubernetes-slave
@@ -52,32 +53,12 @@
       - random-string:
           name: build_tag
 
-- parameter:
-    name: functest-kubernetes-branch
-    parameters:
-      - string:
-          name: branch
-          default: '{branch}'
-
 - parameter:
     name: functest-kubernetes-DEPLOY_SCENARIO
     parameters:
       - string:
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
-- parameter:
-    name: functest-kubernetes-DEBUG
-    parameters:
-      - string:
-          name: DEBUG
-          default: 'true'
-
-- functest-kubernetes-containers: &functest-kubernetes-containers
-    name: 'functest-kubernetes-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
 
 - functest-kubernetes-run-containers: &functest-kubernetes-run-containers
     name: 'functest-kubernetes-run-containers'
@@ -105,7 +86,7 @@
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -119,15 +100,14 @@
             -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 \
             -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 BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -e DEBUG=$DEBUG \
             -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
             $image run_tests -t {test} -p -r
 
 - builder:
@@ -144,43 +124,6 @@
           fi
           docker rmi $image || true
 
-- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
-    name: 'functest-kubernetes-build-containers'
-    <<: *functest-kubernetes-containers
-    ref_arg: '{ref_arg}'
-    path: '{path}'
-
-- builder:
-    name: functest-kubernetes-build-containers
-    builders:
-      - shell: |
-          set +x
-          if [ "{repo}" = "_" ]; then
-            image={container}:{tag}
-          elif [ "{port}" = "None" ]; then
-            image={repo}/{container}:{tag}
-          else
-            image={repo}:{port}/{container}:{tag}
-          fi
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
-          fi
-          cd {path}
-          docker build $build_arg \
-            --pull=false --no-cache --force-rm=true \
-            -t $image .
-
-- scm:
-    name: functest-kubernetes-scm
-    scm:
-      - git:
-          url: https://gerrit.opnfv.org/gerrit/functest-kubernetes
-          refspec: '+refs/changes/*:refs/changes/*'
-          branches:
-            - '{ref}'
-
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
     parameters:
@@ -211,6 +154,13 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-params
@@ -248,6 +198,13 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
     <<: *functest-kubernetes-params
@@ -264,8 +221,6 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -275,6 +230,7 @@
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-healthcheck'
     test:
+      - k8s_quick
       - k8s_smoke
     privileged: 'false'
     network: bridge
@@ -287,9 +243,29 @@
     container: 'functest-kubernetes-smoke'
     test:
       - xrally_kubernetes
+      - k8s_io
       - k8s_conformance
+      - k8s_conformance_serial
+      - sig_api_machinery
+      - sig_api_machinery_serial
+      - sig_apps
+      - sig_apps_serial
+      - sig_auth
+      - sig_cli
+      - sig_cli_serial
+      - sig_cluster_lifecycle
+      - sig_instrumentation
+      - sig_network
+      - sig_network_serial
+      - sig_node
+      - sig_scheduling_serial
+      - sig_storage
+      - sig_storage_serial
     privileged: 'false'
     network: bridge
+    exclude:
+      - {'tag': 'latest', 'test': 'k8s_io'}
+      - {'tag': 'v1.21', 'test': 'k8s_io'}
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -299,7 +275,19 @@
     container: 'functest-kubernetes-security'
     test:
       - kube_hunter
-      - kube_bench
+      - kube_bench_master
+      - kube_bench_node
+    privileged: 'false'
+    network: bridge
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    test:
+      - xrally_kubernetes_full
     privileged: 'false'
     network: bridge
     jobs:
@@ -311,6 +299,8 @@
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
+      - helm_vims
+      - cnf_conformance
     privileged: 'false'
     network: bridge
     jobs:
@@ -322,7 +312,7 @@
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -334,14 +324,13 @@
             -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 \
             -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 \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -e DEBUG=$DEBUG \
             -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
             $image zip_campaign
 
 - job-template:
@@ -353,8 +342,6 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-kubernetes-zip:
           <<: *functest-kubernetes-containers
@@ -370,7 +357,7 @@
     name: 'functest-kubernetes-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
@@ -378,14 +365,12 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes(-pi)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -396,6 +381,8 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -407,198 +394,356 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-pull'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_quick-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           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'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_api_machinery-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_api_machinery_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_apps-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_apps_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_auth-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cluster_lifecycle-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_instrumentation-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_node-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_scheduling_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_storage-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_storage_serial-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-security:{tag}
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
+              <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: dump all campaign data
           projects:
             - name: 'functest-kubernetes-{tag}-zip'
               <<: *functest-kubernetes-jobs
 
+- project:
+    name: 'functest-kubernetes-daily'
+    <<: *functest-kubernetes-params
+    jobs:
+      - 'functest-kubernetes-{tag}-daily'
+
+- view:
+    name: functest-kubernetes
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-kubernetes-[a-z0-9.]+-daily$
+
+- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
+    name: 'functest-kubernetes-build-containers'
+    <<: *functest-kubernetes-containers
+    ref_arg: '{ref_arg}'
+    path: '{path}'
+    buildargs: '{buildargs}'
+    from: '{from}'
+
+- builder:
+    name: functest-kubernetes-build-containers
+    builders:
+      - shell: |
+          set +x
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          build_args=""
+          if [ "{buildargs}" != "None" ]; then
+            build_args="{buildargs}"
+          fi
+          if [ "{ref_arg}" != "None" ]; then
+            build_args="$build_args --build-arg {ref_arg}={ref}"
+          fi
+          cd {path}
+          if [ "{from}" != "None" ]; then
+              sed -i {from} Dockerfile
+          fi
+          docker build $build_args \
+            --pull=false --no-cache --force-rm=true \
+            -t $image .
+
+- scm:
+    name: functest-kubernetes-scm
+    scm:
+      - git:
+          url: 'https://gerrit.opnfv.org/gerrit/functest-kubernetes'
+          refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+          branches:
+            - '{ref}'
+
+- functest-kubernetes-dep: &functest-kubernetes-dep
+    name: 'functest-kubernetes-containers'
+    repo: '{repo}'
+    port: '{port}'
+    tag: '{tag}'
+    dependency: '{dependency}'
+
+- builder:
+    name: functest-kubernetes-pull-dep-images
+    builders:
+      - shell: |
+          set +x
+          if [ "_" = "_" ]; then
+            image=alpine:{dependency}
+          elif [ "None" = "None" ]; then
+            image=_/alpine:{dependency}
+          else
+            image=_:/alpine:{dependency}
+          fi
+          docker pull $image || true
+
+- builder:
+    name: functest-kubernetes-remove-dep-images
+    builders:
+      - shell: |
+          set +x
+          if [ "_" = "_" ]; then
+            image=alpine:{dependency}
+          elif [ "" = "None" ]; then
+            image=_/alpine:{dependency}
+          else
+            image=_:/alpine:{dependency}
+          fi
+          docker rmi $image || true
+
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+    name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+    builders:
+      - functest-kubernetes-pull-dep-images:
+          <<: *functest-kubernetes-dep
+
+- project:
+    name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
+    <<: *functest-kubernetes-params
+    jobs:
+      - 'functest-kubernetes-{repo}-{tag}-dep-pull'
+
+- job-template:
+    name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
+    builders:
+      - functest-kubernetes-remove-dep-images:
+          <<: *functest-kubernetes-dep
+
+- project:
+    name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
+    <<: *functest-kubernetes-params
+    jobs:
+      - 'functest-kubernetes-{repo}-{tag}-dep-rmi'
+
+- builder:
+    name: functest-kubernetes-tox
+    builders:
+      - shell: |
+          set +x
+          apt-get update && apt-get install \
+            software-properties-common gpg -y
+          add-apt-repository -y ppa:deadsnakes/ppa
+          apt-get update && apt-get install 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
+          pip3 install tox tox-pip-version
+
+          tox
+
+- job-template:
+    name: 'functest-kubernetes-{tag}-tox'
     scm:
       - functest-kubernetes-scm:
           ref: $GERRIT_REFSPEC
+    triggers:
+      - functest-kubernetes-patchset-created:
+          branch: '{branch}'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     builders:
-      - functest-kubernetes-build-containers:
-          <<: *functest-kubernetes-build-containers
-          ref: $GERRIT_REFSPEC
+      - functest-kubernetes-tox:
+
+- project:
+    name: functest-kubernetes-tox
+    <<: *functest-kubernetes-params
+    jobs:
+      - 'functest-kubernetes-{tag}-tox'
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-check'
+    name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
-      - functest-kubernetes-branch:
-          branch: '{branch}'
     scm:
       - functest-kubernetes-scm:
-          ref: $branch
+          ref: $GERRIT_REFSPEC
     builders:
       - functest-kubernetes-build-containers:
           <<: *functest-kubernetes-build-containers
-          ref: $branch
-
-- project:
-    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
-    repo: _
-    port:
-    container: golang
-    tag: '1.14-alpine3.12'
-    slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
-
-- project:
-    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
-    repo: _
-    port:
-    container: golang
-    tag: '1.14-alpine3.12'
-    slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+          ref: $GERRIT_REFSPEC
+          buildargs: '{buildargs}'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate
     <<: *functest-kubernetes-params
     container: functest-kubernetes-core
     ref_arg: BRANCH
     path: docker/core
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate
     <<: *functest-kubernetes-params
     container: functest-kubernetes-healthcheck
     ref_arg:
     path: docker/healthcheck
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate
     <<: *functest-kubernetes-params
     container: functest-kubernetes-cnf
     ref_arg: BRANCH
     path: docker/cnf
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate
     <<: *functest-kubernetes-params
     container: functest-kubernetes-security
     ref_arg: BRANCH
     path: docker/security
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate
     <<: *functest-kubernetes-params
     container: functest-kubernetes-smoke
     ref_arg:
     path: docker/smoke
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-benchmarking
+    ref_arg:
+    path: docker/benchmarking
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+
+
+- trigger:
+    name: functest-kubernetes-patchset-created
+    triggers:
+      - gerrit:
+          trigger-on:
+            - patchset-created-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'functest-kubernetes'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
 
 - job-template:
-    name: 'functest-kubernetes-{tag}-check'
+    name: 'functest-kubernetes-{tag}-review'
     project-type: multijob
+    triggers:
+      - functest-kubernetes-patchset-created:
+          branch: '{branch}'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
       - functest-kubernetes-build_tag:
           build_tag: ''
-      - functest-kubernetes-branch:
-          branch: '{branch}'
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes(-pi)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -609,193 +754,369 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: remove dependencies
+          name: remove dependency
           projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
+            - name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: pull dependencies
+          name: pull dependency
           projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
+            - name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: build opnfv/functest-kubernetes-healthcheck
+          name: build containers
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: build containers
+          name: build opnfv/functest-kubernetes-smoke
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
+              <<: *functest-kubernetes-jobs
+      - multijob:
+          name: build opnfv/functest-kubernetes-benchmarking
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_quick-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           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'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_api_machinery-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_api_machinery_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_apps-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_apps_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_auth-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cluster_lifecycle-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_instrumentation-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_node-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_scheduling_serial-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_storage-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_storage_serial-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-security:{tag}
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
+              <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-jobs
+
+- project:
+    name: 'functest-kubernetes-review'
+    <<: *functest-kubernetes-params
+    jobs:
+      - 'functest-kubernetes-{tag}-review'
+
+- view:
+    name: functest-kubernetes-review
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-kubernetes-[a-z0-9.]+-review$
+
+- view:
+    name: functest-kubernetes-tox
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-kubernetes-[a-z0-9.]+-tox$
+
+- builder:
+    name: functest-kubernetes-push-containers
+    builders:
+      - shell: |
+          set +x
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          docker push $image
 
 - trigger:
-    name: functest-kubernetes-patchset-created
+    name: functest-kubernetes-commit
     triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'functest-kubernetes'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
+      - pollscm:
+          cron: "*/30 * * * *"
+
+- job-template:
+    name: 'functest-kubernetes-{repo}-{container}-{tag}-build'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: '{branch}'
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
+          buildargs: '{buildargs}'
+      - functest-kubernetes-push-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: '{branch}'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-core
+    ref_arg: BRANCH
+    path: docker/core
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-healthcheck
+    ref_arg:
+    path: docker/healthcheck
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-cnf
+    ref_arg: BRANCH
+    path: docker/cnf
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-security
+    ref_arg: BRANCH
+    path: docker/security
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-smoke
+    ref_arg:
+    path: docker/smoke
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-benchmarking
+    ref_arg:
+    path: docker/benchmarking
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-build'
+
 
 - job-template:
-    name: 'functest-kubernetes-{tag}-gate'
+    name: 'functest-kubernetes-{tag}-docker'
     project-type: multijob
     triggers:
-      - functest-kubernetes-patchset-created:
-          branch: '{branch}'
+      - functest-kubernetes-commit
+    scm:
+      - functest-kubernetes-scm:
+          ref: '{branch}'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
-      - functest-kubernetes-build_tag:
-          build_tag: ''
-      - functest-kubernetes-DEPLOY_SCENARIO:
-          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes(-pi)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
-          name: remove former images
+          name: remove dependency
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-rmi'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
-              <<: *functest-kubernetes-jobs
-      - multijob:
-          name: remove dependencies
-          projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
+            - name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: pull dependencies
+          name: pull dependency
           projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
+            - name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate'
-              <<: *functest-kubernetes-jobs
-      - multijob:
-          name: build opnfv/functest-kubernetes-healthcheck
-          projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-build'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build containers
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
-              <<: *functest-kubernetes-jobs
-      - multijob:
-          name: opnfv/functest-kubernetes-healthcheck:{tag}
-          projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build'
               <<: *functest-kubernetes-jobs
-      - multijob:
-          name: opnfv/functest-kubernetes-smoke:{tag}
-          projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: opnfv/functest-kubernetes-security:{tag}
+          name: build opnfv/functest-kubernetes-smoke
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: opnfv/functest-kubernetes-cnf:{tag}
+          name: build opnfv/functest-kubernetes-benchmarking
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build'
               <<: *functest-kubernetes-jobs
 
+- builder:
+    name: functest-kubernetes-trivy
+    builders:
+      - shell: |
+          apt-get update && apt-get install curl -y
+
+          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/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
+          ./trivy --exit-code 1 $image
+
+- job-template:
+    name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+    builders:
+      - functest-kubernetes-trivy:
+          <<: *functest-kubernetes-containers
+
 - project:
-    name: 'functest-kubernetes'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-trivy'
     <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-core'
     jobs:
-      - 'functest-kubernetes-{tag}-daily'
+      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
 
 - project:
-    name: 'functest-kubernetes-gate'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-trivy'
     <<: *functest-kubernetes-params
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
+    container: 'functest-kubernetes-healthcheck'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-trivy'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-cnf'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-trivy'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-security'
     jobs:
-      - 'functest-kubernetes-{tag}-check'
-      - 'functest-kubernetes-{tag}-gate'
+      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-trivy'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-smoke'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-trivy'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes'
+    <<: *functest-kubernetes-params
+    jobs:
+      - 'functest-kubernetes-{tag}-docker'
 
 - view:
-    name: functest-kubernetes
+    name: functest-kubernetes-docker
     view-type: list
     columns:
       - status
@@ -804,10 +1125,10 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-(arm.*-|amd64-)*[a-z]+-daily$
+    regex: ^functest-kubernetes-[a-z0-9.]+-docker$
 
 - view:
-    name: functest-kubernetes-gate
+    name: functest-kubernetes-trivy
     view-type: list
     columns:
       - status
@@ -816,4 +1137,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-(arm.*-|amd64-)*[a-z]+-gate$
+    regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-trivy$