Publish the Functest K8s v1.29 jobs

[releng.git] / jjb / functest / functest-kubernetes-pi.yaml

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 02b912e..efab56c 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -8,62 +8,233 @@
 
 - functest-kubernetes-pi-params: &functest-kubernetes-pi-params
     name: 'functest-kubernetes-pi-params'
+    tag:
+      - latest:
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
+      - v1.26:
+          node: v1.26
+      - arm-latest:
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
+      - arm-v1.26:
+          node: v1.26
+      - arm64-latest:
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
+      - arm64-v1.26:
+          node: v1.26
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-healthcheck'
+    port:
+    tag:
+      - latest:
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
+      - v1.26:
+          node: v1.26
+      - arm-latest:
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
+      - arm-v1.26:
+          node: v1.26
+      - arm64-latest:
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
+      - arm64-v1.26:
+          node: v1.26
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-smoke'
+    port:
+    tag:
+      - latest:
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
+      - v1.26:
+          node: v1.26
+      - arm-latest:
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
+      - arm-v1.26:
+          node: v1.26
+      - arm64-latest:
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
+      - arm64-v1.26:
+          node: v1.26
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-security-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-params'
     repo: 'ollivier'
+    container: 'functest-kubernetes-security'
+    port:
+    tag:
+      - latest:
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
+      - v1.26:
+          node: v1.26
+      - arm-latest:
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
+      - arm-v1.26:
+          node: v1.26
+      - arm64-latest:
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
+      - arm64-v1.26:
+          node: v1.26
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-benchmarking'
     port:
     tag:
       - latest:
-          slave: lf-virtual1-8
-      - v1.24:
-          slave: lf-virtual1-9
-      - v1.23:
-          slave: lf-virtual1-9
-      - v1.22:
-          slave: lf-virtual1-7
-      - v1.21:
-          slave: lf-virtual1-6
-      - leguer:
-          slave: lf-virtual1-5
-      - kali:
-          slave: lf-virtual1-4
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
+      - v1.26:
+          node: v1.26
       - arm-latest:
-          slave: lf-virtual1-8
-      - arm-v1.24:
-          slave: lf-virtual1-9
-      - arm-v1.23:
-          slave: lf-virtual1-9
-      - arm-v1.22:
-          slave: lf-virtual1-7
-      - arm-v1.21:
-          slave: lf-virtual1-6
-      - arm-leguer:
-          slave: lf-virtual1-5
-      - arm-kali:
-          slave: lf-virtual1-4
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
+      - arm-v1.26:
+          node: v1.26
       - arm64-latest:
-          slave: lf-virtual1-8
-      - arm64-v1.24:
-          slave: lf-virtual1-9
-      - arm64-v1.23:
-          slave: lf-virtual1-9
-      - arm64-v1.22:
-          slave: lf-virtual1-7
-      - arm64-v1.21:
-          slave: lf-virtual1-6
-      - arm64-leguer:
-          slave: lf-virtual1-5
-      - arm64-kali:
-          slave: lf-virtual1-4
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
+      - arm64-v1.26:
+          node: v1.26
+
+- functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params'
+    repo: 'ollivier'
+    container: 'functest-kubernetes-cnf'
+    port:
+    tag:
+      - latest:
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
+      - v1.26:
+          node: v1.26
+      - arm-latest:
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
+      - arm-v1.26:
+          node: v1.26
+      - arm64-latest:
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
+      - arm64-v1.26:
+          node: v1.26
 
 - functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
     name: 'functest-kubernetes-pi-jobs'
     current-parameters: true
 
 - parameter:
-    name: functest-kubernetes-pi-slave
+    name: functest-kubernetes-pi-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: functest-kubernetes-pi-build_tag
@@ -78,17 +249,9 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
-- 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}'
@@ -153,7 +316,7 @@
             -v /home/opnfv/functest-kubernetes/.boto:/etc/boto.cfg \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=$slave \
+            -e NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             $image run_tests -t {test} -p -r
@@ -173,116 +336,177 @@
           docker rmi $image || true
 
 - job-template:
-    name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-pull'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-pi-pull-containers:
           <<: *functest-kubernetes-pi-containers
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-healthcheck'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-smoke'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-security'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-benchmarking'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-cnf'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
 
 - job-template:
-    name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-pi-remove-images:
           <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-healthcheck'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-smoke'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-security'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-pull-containers:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
-    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-benchmarking'
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
+
+- job-template:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
+    parameters:
+      - functest-kubernetes-pi-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-pi-remove-images:
+          <<: *functest-kubernetes-pi-containers
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-rmi'
-    <<: *functest-kubernetes-pi-params
-    container: 'functest-kubernetes-cnf'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     jobs:
-      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
 
 - job-template:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
       - 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
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-healthcheck'
     test:
@@ -298,31 +522,29 @@
 - job-template:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
       - 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
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-smoke'
     test:
       - xrally_kubernetes
-      - k8s_io
       - k8s_conformance
       - k8s_conformance_serial
       - sig_api_machinery
@@ -341,65 +563,31 @@
     network: bridge
     uid: 1000
     gid: 1000
-    exclude:
-      - tag: latest
-        test: k8s_io
-      - tag: v1.24
-        test: k8s_io
-      - tag: v1.23
-        test: k8s_io
-      - tag: v1.22
-        test: k8s_io
-      - tag: v1.21
-        test: k8s_io
-      - tag: jerma
-        test: k8s_io
-      - tag: arm-latest
-        test: k8s_io
-      - tag: arm-v1.24
-        test: k8s_io
-      - tag: arm-v1.23
-        test: k8s_io
-      - tag: arm-v1.22
-        test: k8s_io
-      - tag: arm-v1.21
-        test: k8s_io
-      - tag: arm64-latest
-        test: k8s_io
-      - tag: arm64-v1.24
-        test: k8s_io
-      - tag: arm64-v1.23
-        test: k8s_io
-      - tag: arm64-v1.22
-        test: k8s_io
-      - tag: arm64-v1.21
-        test: k8s_io
     jobs:
       - '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-node:
+          node: '{node}'
       - 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
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-security'
     test:
@@ -416,26 +604,25 @@
 - job-template:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
       - 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
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-benchmarking'
     test:
@@ -451,26 +638,25 @@
 - job-template:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
       - 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
+          test: '{test}'
 
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf'
-    <<: *functest-kubernetes-pi-params
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-cnf'
     test:
@@ -515,6 +701,8 @@
           mkdir -p $WORKSPACE/results
           chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
@@ -524,6 +712,7 @@
             -v /home/opnfv/functest-kubernetes/.boto:/etc/boto.cfg \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             $image zip_campaign
@@ -531,33 +720,28 @@
 - job-template:
     name: 'functest-kubernetes-pi-{tag}-zip'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
       - 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-zip:
-          <<: *functest-kubernetes-pi-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *functest-kubernetes-pi-run-containers
 
 - project:
-    name: 'functest-kubernetes-pi-{tag}-zip'
-    <<: *functest-kubernetes-pi-params
+    name: 'functest-kubernetes-pi-zip'
+    <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
@@ -569,21 +753,19 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
       - 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
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -625,8 +807,6 @@
           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'