X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=a874110f0032f4d8cd6c9940c9f344851fe1f4ee;hb=196ce49240ed59511a4b7f908a43205f9aa59960;hp=bcd6fde8177473422c796c426731a01945f03cf1;hpb=aa4722a1d16999ee50807da2f9d5866d5d863bd5;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index bcd6fde81..a874110f0 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,59 +12,33 @@
     port:
     tag:
       - latest:
-          branch: 'master'
+          slave: lf-virtual1-7
+      - v1.21:
           slave: lf-virtual1-6
       - leguer:
-          branch: 'master'
           slave: lf-virtual1-5
       - kali:
-          branch: 'master'
           slave: lf-virtual1-4
-      - jerma:
-          branch: 'master'
-          slave: lf-virtual1-3
-      - iruya:
-          branch: 'master'
-          slave: lf-virtual1-2
-      - hunter:
-          branch: 'master'
-          slave: lf-virtual1-1
       - arm-latest:
-          branch: 'master'
+          slave: lf-virtual1-7
+      - arm-v1.21:
           slave: lf-virtual1-6
       - arm-leguer:
-          branch: 'master'
           slave: lf-virtual1-5
       - arm-kali:
-          branch: 'master'
           slave: lf-virtual1-4
-      - arm-jerma:
-          branch: 'master'
-          slave: lf-virtual1-3
-      - arm-iruya:
-          branch: 'master'
-          slave: lf-virtual1-2
-      - arm-hunter:
-          branch: 'master'
-          slave: lf-virtual1-1
       - arm64-latest:
-          branch: 'master'
+          slave: lf-virtual1-7
+      - arm64-v1.21:
           slave: lf-virtual1-6
       - arm64-leguer:
-          branch: 'master'
           slave: lf-virtual1-5
       - arm64-kali:
-          branch: 'master'
           slave: lf-virtual1-4
-      - arm64-jerma:
-          branch: 'master'
-          slave: lf-virtual1-3
-      - arm64-iruya:
-          branch: 'master'
-          slave: lf-virtual1-2
-      - arm64-hunter:
-          branch: 'master'
-          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
@@ -83,18 +60,20 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
-- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
-    name: 'functest-kubernetes-pi-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
+- parameter:
+    name: functest-kubernetes-pi-E2E_TEST_OPTS
+    parameters:
+      - string:
+          name: E2E_TEST_OPTS
+          default: container-runtime:containerd
 
 - functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
     name: 'functest-kubernetes-pi-run-containers'
     <<: *functest-kubernetes-pi-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
 
 - builder:
@@ -116,6 +95,14 @@
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -127,6 +114,8 @@
           docker run --rm \
             --privileged={privileged} \
             --network={network} \
+            $volumes \
+            $env \
             -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 \
@@ -136,8 +125,6 @@
             -e NODE_NAME=$slave \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image run_tests -t {test} -p -r
 
 - builder:
@@ -154,7 +141,6 @@
           fi
           docker rmi $image || true
 
-
 - job-template:
     name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
     parameters:
@@ -244,7 +230,7 @@
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
 
 - job-template:
-    name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-{test}-run'
     parameters:
       - functest-kubernetes-pi-slave:
           slave: '{slave}'
@@ -252,6 +238,8 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
@@ -259,6 +247,11 @@
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck'
     <<: *functest-kubernetes-pi-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-healthcheck'
     test:
       - k8s_quick
@@ -266,72 +259,95 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-pi-slave:
+          slave: '{slave}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-pi-run-containers:
+          <<: *functest-kubernetes-pi-run-containers
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke'
     <<: *functest-kubernetes-pi-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     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': 'arm-leguer', 'test': 'sig_network'}
-      - {'tag': 'arm-leguer', 'test': 'sig_network_features'}
-      - {'tag': 'arm-leguer', 'test': 'sig_storage'}
-      - {'tag': 'arm-kali', 'test': 'sig_network'}
-      - {'tag': 'arm-kali', 'test': 'sig_network_features'}
-      - {'tag': 'arm-kali', 'test': 'sig_storage'}
-      - {'tag': 'arm-jerma', 'test': 'sig_network'}
-      - {'tag': 'arm-jerma', 'test': 'sig_network_features'}
-      - {'tag': 'arm-jerma', 'test': 'sig_storage'}
-      - {'tag': 'arm-iruya', 'test': 'sig_network'}
-      - {'tag': 'arm-iruya', 'test': 'sig_network_features'}
-      - {'tag': 'arm-iruya', 'test': 'sig_storage'}
-      - {'tag': 'arm-hunter', 'test': 'sig_network'}
-      - {'tag': 'arm-hunter', 'test': 'sig_network_features'}
-      - {'tag': 'arm-hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_network'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_storage'}
-      - {'tag': 'arm64-kali', 'test': 'sig_network'}
-      - {'tag': 'arm64-kali', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-kali', 'test': 'sig_storage'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_network'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_storage'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_network'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_storage'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_network'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_storage'}
+      - tag: latest
+        test: k8s_io
+      - tag: v1.21
+        test: k8s_io
+      - tag: jerma
+        test: k8s_io
+      - tag: arm-latest
+        test: k8s_io
+      - tag: arm-v1.21
+        test: k8s_io
+      - tag: arm64-latest
+        test: k8s_io
+      - tag: arm64-v1.21
+        test: k8s_io
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-pi-slave:
+          slave: '{slave}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-pi-run-containers:
+          <<: *functest-kubernetes-pi-run-containers
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security'
     <<: *functest-kubernetes-pi-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-security'
     test:
       - kube_hunter
@@ -340,38 +356,87 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-pi-slave:
+          slave: '{slave}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-pi-run-containers:
+          <<: *functest-kubernetes-pi-run-containers
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
     <<: *functest-kubernetes-pi-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-pi-slave:
+          slave: '{slave}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-pi-run-containers:
+          <<: *functest-kubernetes-pi-run-containers
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf'
     <<: *functest-kubernetes-pi-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
-
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-{test}-run'
 
 - builder:
     name: functest-kubernetes-pi-zip
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          fi
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -380,6 +445,8 @@
             image={repo}:{port}/{container}:{tag}
           fi
           docker run --rm \
+            $volumes \
+            $env \
             -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 \
@@ -388,8 +455,6 @@
             -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 \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image zip_campaign
 
 - job-template:
@@ -401,13 +466,22 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-pi-zip:
           <<: *functest-kubernetes-pi-containers
+          volumes: '{volumes}'
+          env: '{env}'
 
 - project:
     name: 'functest-kubernetes-pi-{tag}-zip'
     <<: *functest-kubernetes-pi-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-healthcheck'
     jobs:
       - 'functest-kubernetes-pi-{tag}-zip'
@@ -424,12 +498,16 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-pi-{tag}-(daily|docker|review)$'
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -466,17 +544,46 @@
               <<: *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_io-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}-k8s_conformance_serial-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_api_machinery_serial-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_apps_serial-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_cli_serial-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'
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_network_serial-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_scheduling_serial-run'
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_storage-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_storage_serial-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-security:{tag}
           projects:
@@ -491,6 +598,8 @@
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:
@@ -498,7 +607,7 @@
               <<: *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'
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: dump all campaign data
@@ -507,7 +616,7 @@
               <<: *functest-kubernetes-pi-jobs
 
 - project:
-    name: 'functest-kubernetes-pi'
+    name: 'functest-kubernetes-pi-daily'
     <<: *functest-kubernetes-pi-params
     jobs:
       - 'functest-kubernetes-pi-{tag}-daily'
@@ -522,4 +631,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-pi-[a-z-0-9]+-daily$
+    regex: ^functest-kubernetes-pi-[a-z-0-9.]+-daily$