X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=8bc4cc08632e59c6e9ef62beddc00f6db3f79084;hb=45a8dd15b1bf241c83460213c743eb666fdab680;hp=c22320277188edbee82c26727562e84c98b2e1e1;hpb=47390f81d7138b5ef9bba50e6cfbc1e65e0c37cd;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index c22320277..8bc4cc086 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -1,7 +1,10 @@
 ---
-- functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
-    name: 'functest-kubernetes-pi-jobs'
-    current-parameters: true
+- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
+    name: 'functest-kubernetes-pi-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - functest-kubernetes-pi-params: &functest-kubernetes-pi-params
     name: 'functest-kubernetes-pi-params'
@@ -9,51 +12,46 @@
     port:
     tag:
       - latest:
-          branch: master
+          slave: lf-virtual1-6
+      - leguer:
           slave: lf-virtual1-5
       - kali:
-          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
       - arm-latest:
-          branch: master
+          slave: lf-virtual1-6
+      - arm-leguer:
           slave: lf-virtual1-5
       - arm-kali:
-          branch: stable/kali
           slave: lf-virtual1-4
       - arm-jerma:
-          branch: stable/jerma
           slave: lf-virtual1-3
       - arm-iruya:
-          branch: stable/iruya
           slave: lf-virtual1-2
       - arm-hunter:
-          branch: stable/hunter
           slave: lf-virtual1-1
       - arm64-latest:
-          branch: master
+          slave: lf-virtual1-6
+      - arm64-leguer:
           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
 
+- functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
+    name: 'functest-kubernetes-pi-jobs'
+    current-parameters: true
+
 - parameter:
     name: functest-kubernetes-pi-slave
     parameters:
@@ -67,32 +65,12 @@
       - random-string:
           name: build_tag
 
-- parameter:
-    name: functest-kubernetes-pi-branch
-    parameters:
-      - string:
-          name: branch
-          default: '{branch}'
-
 - parameter:
     name: functest-kubernetes-pi-DEPLOY_SCENARIO
     parameters:
       - string:
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
-- parameter:
-    name: functest-kubernetes-pi-DEBUG
-    parameters:
-      - string:
-          name: DEBUG
-          default: 'true'
-
-- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
-    name: 'functest-kubernetes-pi-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
 
 - functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
     name: 'functest-kubernetes-pi-run-containers'
@@ -120,7 +98,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
@@ -134,15 +112,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:
@@ -159,7 +136,6 @@
           fi
           docker rmi $image || true
 
-
 - job-template:
     name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
     parameters:
@@ -173,9 +149,6 @@
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-pull'
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-healthcheck'
-    exclude:
-      - tag: arm-hunter
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
 
@@ -183,9 +156,6 @@
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-pull'
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-smoke'
-    exclude:
-      - tag: arm-hunter
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
 
@@ -196,6 +166,13 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-pi-params
@@ -216,9 +193,6 @@
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-rmi'
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-healthcheck'
-    exclude:
-      - tag: arm-hunter
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
 
@@ -226,9 +200,6 @@
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-rmi'
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-smoke'
-    exclude:
-      - tag: arm-hunter
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
 
@@ -239,6 +210,13 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-rmi'
     <<: *functest-kubernetes-pi-params
@@ -255,8 +233,6 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-pi-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
@@ -266,10 +242,8 @@
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-healthcheck'
     test:
+      - k8s_quick
       - k8s_smoke
-    exclude:
-      - tag: arm-hunter
-      - tag: arm64-hunter
     privileged: 'false'
     network: bridge
     jobs:
@@ -282,11 +256,109 @@
     test:
       - xrally_kubernetes
       - k8s_conformance
-    exclude:
-      - tag: arm-hunter
-      - tag: arm64-hunter
+      - sig_api_machinery
+      - sig_apps
+      - sig_auth
+      - sig_cli
+      - sig_cluster_lifecycle
+      - sig_instrumentation
+      - sig_network
+      - sig_network_features
+      - sig_node
+      - sig_storage
     privileged: 'false'
     network: bridge
+    exclude:
+      - {'tag': 'jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'jerma', 'test': 'sig_apps'}
+      - {'tag': 'jerma', 'test': 'sig_auth'}
+      - {'tag': 'jerma', 'test': 'sig_cli'}
+      - {'tag': 'jerma', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'jerma', 'test': 'sig_instrumentation'}
+      - {'tag': 'jerma', 'test': 'sig_network'}
+      - {'tag': 'jerma', 'test': 'sig_network_features'}
+      - {'tag': 'jerma', 'test': 'sig_node'}
+      - {'tag': 'jerma', 'test': 'sig_storage'}
+      - {'tag': 'iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'iruya', 'test': 'sig_apps'}
+      - {'tag': 'iruya', 'test': 'sig_auth'}
+      - {'tag': 'iruya', 'test': 'sig_cli'}
+      - {'tag': 'iruya', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'iruya', 'test': 'sig_instrumentation'}
+      - {'tag': 'iruya', 'test': 'sig_network'}
+      - {'tag': 'iruya', 'test': 'sig_network_features'}
+      - {'tag': 'iruya', 'test': 'sig_node'}
+      - {'tag': 'iruya', 'test': 'sig_storage'}
+      - {'tag': 'hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'hunter', 'test': 'sig_apps'}
+      - {'tag': 'hunter', 'test': 'sig_auth'}
+      - {'tag': 'hunter', 'test': 'sig_cli'}
+      - {'tag': 'hunter', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'hunter', 'test': 'sig_instrumentation'}
+      - {'tag': 'hunter', 'test': 'sig_network'}
+      - {'tag': 'hunter', 'test': 'sig_network_features'}
+      - {'tag': 'hunter', 'test': 'sig_node'}
+      - {'tag': 'hunter', 'test': 'sig_storage'}
+      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-jerma', 'test': 'sig_apps'}
+      - {'tag': 'arm-jerma', 'test': 'sig_auth'}
+      - {'tag': 'arm-jerma', 'test': 'sig_cli'}
+      - {'tag': 'arm-jerma', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm-jerma', 'test': 'sig_instrumentation'}
+      - {'tag': 'arm-jerma', 'test': 'sig_network'}
+      - {'tag': 'arm-jerma', 'test': 'sig_network_features'}
+      - {'tag': 'arm-jerma', 'test': 'sig_node'}
+      - {'tag': 'arm-jerma', 'test': 'sig_storage'}
+      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-iruya', 'test': 'sig_apps'}
+      - {'tag': 'arm-iruya', 'test': 'sig_auth'}
+      - {'tag': 'arm-iruya', 'test': 'sig_cli'}
+      - {'tag': 'arm-iruya', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm-iruya', 'test': 'sig_instrumentation'}
+      - {'tag': 'arm-iruya', 'test': 'sig_network'}
+      - {'tag': 'arm-iruya', 'test': 'sig_network_features'}
+      - {'tag': 'arm-iruya', 'test': 'sig_node'}
+      - {'tag': 'arm-iruya', 'test': 'sig_storage'}
+      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-hunter', 'test': 'sig_apps'}
+      - {'tag': 'arm-hunter', 'test': 'sig_auth'}
+      - {'tag': 'arm-hunter', 'test': 'sig_cli'}
+      - {'tag': 'arm-hunter', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm-hunter', 'test': 'sig_instrumentation'}
+      - {'tag': 'arm-hunter', 'test': 'sig_network'}
+      - {'tag': 'arm-hunter', 'test': 'sig_network_features'}
+      - {'tag': 'arm-hunter', 'test': 'sig_node'}
+      - {'tag': 'arm-hunter', 'test': 'sig_storage'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_apps'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_auth'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_cli'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_instrumentation'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_network'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_network_features'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_node'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_storage'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_apps'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_auth'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_cli'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_instrumentation'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_network'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_network_features'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_node'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_storage'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_apps'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_auth'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_cli'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_instrumentation'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_network'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_network_features'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_node'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_storage'}
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
@@ -296,7 +368,19 @@
     container: 'functest-kubernetes-security'
     test:
       - kube_hunter
-      - kube_bench
+      - kube_bench_master
+      - kube_bench_node
+    privileged: 'false'
+    network: bridge
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    test:
+      - xrally_kubernetes_full
     privileged: 'false'
     network: bridge
     jobs:
@@ -308,6 +392,8 @@
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
+      - helm_vims
+      - cnf_conformance
     privileged: 'false'
     network: bridge
     jobs:
@@ -319,7 +405,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
@@ -331,14 +417,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:
@@ -350,8 +435,6 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-pi-DEBUG:
-          DEBUG: 'true'
     builders:
       - functest-kubernetes-pi-zip:
           <<: *functest-kubernetes-pi-containers
@@ -359,7 +442,7 @@
 - project:
     name: 'functest-kubernetes-pi-{tag}-zip'
     <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-security'
+    container: 'functest-kubernetes-healthcheck'
     jobs:
       - 'functest-kubernetes-pi-{tag}-zip'
 
@@ -367,7 +450,7 @@
     name: 'functest-kubernetes-pi-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-pi-slave:
           slave: '{slave}'
@@ -375,14 +458,12 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-pi-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-pi-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -393,6 +474,8 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
@@ -404,41 +487,76 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-healthcheck:{tag}
           projects:
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-k8s_quick-run'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_api_machinery-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_apps-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_auth-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_cli-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_cluster_lifecycle-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_instrumentation-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_network-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_network_features-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_node-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_storage-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-security:{tag}
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-pi-jobs
-            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench-run'
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench_master-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench_node-run'
+              <<: *functest-kubernetes-pi-jobs
+      - multijob:
+          name: ollivier/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-helm_vims-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: dump all campaign data
           projects:
             - name: 'functest-kubernetes-pi-{tag}-zip'
               <<: *functest-kubernetes-pi-jobs
 
-
 - project:
-    name: 'functest-kubernetes-pi'
+    name: 'functest-kubernetes-pi-daily'
     <<: *functest-kubernetes-pi-params
     jobs:
       - 'functest-kubernetes-pi-{tag}-daily'
@@ -453,4 +571,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-pi-(arm.*-|amd64-)*[a-z]+-daily$
+    regex: ^functest-kubernetes-pi-[a-z-0-9.]+-daily$