X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=f463a7844addb3c0c8e0ade94d01ad3438ba0a3c;hb=fa58f229c41de75e3fd1b44a9a383c5ed539d456;hp=a07a51c08c248e459859e2a345b6c2eb6e13a673;hpb=c8c8fdd1dc96d495ded25a121593f5e5066e9786;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index a07a51c08..f463a7844 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,29 +12,33 @@
     port:
     tag:
       - latest:
+          from:
+          buildargs:
           branch: master
+          slave: lf-virtual1-7
+          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
           dependency: 3.11
-      - jerma:
-          branch: stable/jerma
-          slave: lf-virtual1-3
-          dependency: 3.10
-      - iruya:
-          branch: stable/iruya
-          slave: lf-virtual1-2
-          dependency: 3.9
-      - hunter:
-          branch: stable/hunter
-          slave: lf-virtual1-1
-          dependency: 3.9
+
+- functest-kubernetes-jobs: &functest-kubernetes-jobs
+    name: 'functest-kubernetes-jobs'
+    current-parameters: true
 
 - parameter:
     name: functest-kubernetes-slave
@@ -52,19 +59,6 @@
       - 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'
@@ -113,7 +107,6 @@
             -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 \
             $image run_tests -t {test} -p -r
 
@@ -131,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/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
-          branches:
-            - '{ref}'
-
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
     parameters:
@@ -265,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
@@ -289,28 +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_features
+      - sig_network_serial
+      - sig_node
+      - sig_scheduling_serial
       - sig_storage
+      - sig_storage_serial
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'leguer', 'test': 'sig_network'}
-      - {'tag': 'leguer', 'test': 'sig_network_features'}
-      - {'tag': 'leguer', 'test': 'sig_storage'}
-      - {'tag': 'kali', 'test': 'sig_network'}
-      - {'tag': 'kali', 'test': 'sig_network_features'}
-      - {'tag': 'kali', 'test': 'sig_storage'}
-      - {'tag': 'jerma', 'test': 'sig_network'}
-      - {'tag': 'jerma', 'test': 'sig_network_features'}
-      - {'tag': 'jerma', 'test': 'sig_storage'}
-      - {'tag': 'iruya', 'test': 'sig_network'}
-      - {'tag': 'iruya', 'test': 'sig_network_features'}
-      - {'tag': 'iruya', 'test': 'sig_storage'}
-      - {'tag': 'hunter', 'test': 'sig_network'}
-      - {'tag': 'hunter', 'test': 'sig_network_features'}
-      - {'tag': 'hunter', 'test': 'sig_storage'}
+      - {'tag': 'latest', 'test': 'k8s_io'}
+      - {'tag': 'v1.21', 'test': 'k8s_io'}
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -333,6 +288,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -345,7 +301,7 @@
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
@@ -357,6 +313,7 @@
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -374,7 +331,6 @@
             -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 \
             $image zip_campaign
 
@@ -387,8 +343,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
@@ -404,7 +358,7 @@
     name: 'functest-kubernetes-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
@@ -412,14 +366,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-{tag}-(daily|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -456,17 +408,46 @@
               <<: *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_features-run'
+            - 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:
@@ -481,6 +462,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -488,7 +471,7 @@
               <<: *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'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: dump all campaign data
@@ -496,6 +479,68 @@
             - 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}'
@@ -510,10 +555,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "None" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           docker pull $image || true
 
@@ -524,10 +569,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           docker rmi $image || true
 
@@ -566,13 +611,15 @@
     builders:
       - shell: |
           set +x
-          apt-get update && apt-get install software-properties-common gpg -y
+          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 \
+          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 python3-pip enchant -y
+            python python-dev python3-pip enchant -y
           pip3 install tox tox-pip-version
+
           tox
 
 - job-template:
@@ -595,6 +642,20 @@
     jobs:
       - 'functest-kubernetes-{tag}-tox'
 
+- job-template:
+    name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+    scm:
+      - functest-kubernetes-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - functest-kubernetes-build-containers:
+          <<: *functest-kubernetes-build-containers
+          ref: $GERRIT_REFSPEC
+          buildargs: '{buildargs}'
+
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate
     <<: *functest-kubernetes-params
@@ -650,19 +711,6 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
 
 
-- job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-    parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
-    scm:
-      - functest-kubernetes-scm:
-          ref: $GERRIT_REFSPEC
-    builders:
-      - functest-kubernetes-build-containers:
-          <<: *functest-kubernetes-build-containers
-          ref: $GERRIT_REFSPEC
-
 - trigger:
     name: functest-kubernetes-patchset-created
     triggers:
@@ -693,14 +741,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-{tag}-(daily|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -758,17 +804,46 @@
               <<: *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_features-run'
+            - 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:
@@ -783,6 +858,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -790,9 +867,39 @@
               <<: *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'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-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:
@@ -825,6 +932,7 @@
       - functest-kubernetes-build-containers:
           <<: *functest-kubernetes-build-containers
           ref: '{branch}'
+          buildargs: '{buildargs}'
       - functest-kubernetes-push-containers:
           <<: *functest-kubernetes-build-containers
           ref: '{branch}'
@@ -895,10 +1003,12 @@
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
-      - 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-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove dependency
@@ -939,6 +1049,8 @@
     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}
@@ -951,6 +1063,8 @@
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
@@ -958,34 +1072,45 @@
       - functest-kubernetes-trivy:
           <<: *functest-kubernetes-containers
 
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-trivy'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-core'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-trivy'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-healthcheck'
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-trivy'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-trivy'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-smoke'
+    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-{repo}-{container}-{tag}-trivy'
+
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-trivy'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-trivy'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-benchmarking'
+    container: 'functest-kubernetes-smoke'
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-trivy'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-trivy'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-cnf'
+    container: 'functest-kubernetes-benchmarking'
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
 
@@ -993,47 +1118,8 @@
     name: 'functest-kubernetes'
     <<: *functest-kubernetes-params
     jobs:
-      - 'functest-kubernetes-{tag}-daily'
-      - 'functest-kubernetes-{tag}-review'
       - 'functest-kubernetes-{tag}-docker'
 
-
-- view:
-    name: functest-kubernetes-daily
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-daily$
-
-- view:
-    name: functest-kubernetes-review
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-review$
-
-- view:
-    name: functest-kubernetes-tox
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-tox$
-
 - view:
     name: functest-kubernetes-docker
     view-type: list
@@ -1044,7 +1130,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-docker$
+    regex: ^functest-kubernetes-[a-z0-9.]+-docker$
 
 - view:
     name: functest-kubernetes-trivy
@@ -1056,4 +1142,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z-]+-trivy$
+    regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-trivy$