X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=3420f2f66ddfbd3d41958f793344af6bab17f95e;hb=e6189c9f5211c64bc0dc146ccf65762805969b33;hp=4d6ec25bb92804740e022b6f1f40865b42ddee07;hpb=dece25372d52734a58f00bb1547195e9e138625a;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 4d6ec25bb..3420f2f66 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -8,50 +8,341 @@
 
 - functest-kubernetes-pi-params: &functest-kubernetes-pi-params
     name: 'functest-kubernetes-pi-params'
+    tag:
+      - latest:
+          node: lf-virtual1-9
+      - v1.28:
+          node: lf-virtual1-1
+      - v1.27:
+          node: lf-virtual1-1
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.28:
+          node: lf-virtual1-1
+      - arm-v1.27:
+          node: lf-virtual1-1
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.28:
+          node: lf-virtual1-1
+      - arm64-v1.27:
+          node: lf-virtual1-1
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- 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: lf-virtual1-9
+      - v1.28:
+          node: lf-virtual1-1
+      - v1.27:
+          node: lf-virtual1-1
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.28:
+          node: lf-virtual1-1
+      - arm-v1.27:
+          node: lf-virtual1-1
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.28:
+          node: lf-virtual1-1
+      - arm64-v1.27:
+          node: lf-virtual1-1
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- 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: lf-virtual1-9
+      - v1.28:
+          node: lf-virtual1-1
+      - v1.27:
+          node: lf-virtual1-1
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.28:
+          node: lf-virtual1-1
+      - arm-v1.27:
+          node: lf-virtual1-1
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.28:
+          node: lf-virtual1-1
+      - arm64-v1.27:
+          node: lf-virtual1-1
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- 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:
-          slave: lf-virtual1-8
+          node: lf-virtual1-9
+      - v1.28:
+          node: lf-virtual1-1
+      - v1.27:
+          node: lf-virtual1-1
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
       - v1.22:
-          slave: lf-virtual1-7
-      - v1.21:
-          slave: lf-virtual1-6
-      - leguer:
-          slave: lf-virtual1-5
-      - kali:
-          slave: lf-virtual1-4
+          node: lf-virtual1-5
       - arm-latest:
-          slave: lf-virtual1-8
+          node: lf-virtual1-9
+      - arm-v1.28:
+          node: lf-virtual1-1
+      - arm-v1.27:
+          node: lf-virtual1-1
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
       - 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: lf-virtual1-5
       - arm64-latest:
-          slave: lf-virtual1-8
+          node: lf-virtual1-9
+      - arm64-v1.28:
+          node: lf-virtual1-1
+      - arm64-v1.27:
+          node: lf-virtual1-1
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
       - 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: lf-virtual1-5
+
+- 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:
+          node: lf-virtual1-9
+      - v1.28:
+          node: lf-virtual1-1
+      - v1.27:
+          node: lf-virtual1-1
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.28:
+          node: lf-virtual1-1
+      - arm-v1.27:
+          node: lf-virtual1-1
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.28:
+          node: lf-virtual1-1
+      - arm64-v1.27:
+          node: lf-virtual1-1
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
+
+- 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: lf-virtual1-9
+      - v1.28:
+          node: lf-virtual1-1
+      - v1.27:
+          node: lf-virtual1-1
+      - v1.26:
+          node: lf-virtual1-1
+      - v1.25:
+          node: lf-virtual1-8
+      - v1.24:
+          node: lf-virtual1-7
+      - v1.23:
+          node: lf-virtual1-6
+      - v1.22:
+          node: lf-virtual1-5
+      - arm-latest:
+          node: lf-virtual1-9
+      - arm-v1.28:
+          node: lf-virtual1-1
+      - arm-v1.27:
+          node: lf-virtual1-1
+      - arm-v1.26:
+          node: lf-virtual1-1
+      - arm-v1.25:
+          node: lf-virtual1-8
+      - arm-v1.24:
+          node: lf-virtual1-7
+      - arm-v1.23:
+          node: lf-virtual1-6
+      - arm-v1.22:
+          node: lf-virtual1-5
+      - arm64-latest:
+          node: lf-virtual1-9
+      - arm64-v1.28:
+          node: lf-virtual1-1
+      - arm64-v1.27:
+          node: lf-virtual1-1
+      - arm64-v1.26:
+          node: lf-virtual1-1
+      - arm64-v1.25:
+          node: lf-virtual1-8
+      - arm64-v1.24:
+          node: lf-virtual1-7
+      - arm64-v1.23:
+          node: lf-virtual1-6
+      - arm64-v1.22:
+          node: lf-virtual1-5
 
 - 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
@@ -66,21 +357,16 @@
           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}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
+    published_ports: '{published_ports}'
 
 - builder:
     name: functest-kubernetes-pi-pull-containers
@@ -111,6 +397,11 @@
             for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
               do env="-e $i $env"; done
           fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -119,18 +410,21 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
             --privileged={privileged} \
             --network={network} \
             $volumes \
             $env \
+            $published_ports \
             -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 \
+            -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
@@ -150,152 +444,215 @@
           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:
       - k8s_quick
       - k8s_smoke
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-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
@@ -312,53 +669,34 @@
       - sig_storage_serial
     privileged: 'false'
     network: bridge
-    exclude:
-      - tag: latest
-        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.22
-        test: k8s_io
-      - tag: arm-v1.21
-        test: k8s_io
-      - tag: arm64-latest
-        test: k8s_io
-      - tag: arm64-v1.22
-        test: k8s_io
-      - tag: arm64-v1.21
-        test: k8s_io
+    uid: 1000
+    gid: 1000
     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:
       - kube_hunter
@@ -366,64 +704,68 @@
       - kube_bench_node
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-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:
       - xrally_kubernetes_full
       - netperf
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-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:
       - k8s_vims
@@ -431,6 +773,8 @@
       - cnf_testsuite
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-{test}-run'
 
@@ -449,6 +793,11 @@
             for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
               do env="-e $i $env"; done
           fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -457,15 +806,21 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
+            $published_ports \
             -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 \
+            -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
@@ -473,29 +828,30 @@
 - 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}'
+          <<: *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:
       - 'functest-kubernetes-pi-{tag}-zip'
 
@@ -505,21 +861,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:
@@ -561,8 +915,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'
@@ -621,6 +973,12 @@
           projects:
             - name: 'functest-kubernetes-pi-{tag}-zip'
               <<: *functest-kubernetes-pi-jobs
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-pi-daily'