X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=3b16f68ea8004cacdb5af9185343ae428799018f;hb=528bf1684d7008e9b0134d9f4883d4e8c29d3669;hp=8c80db297a728b9d93f95e2886eb0a0f2b6dd657;hpb=1952b95f7514adaf51b066c803002127d1ec1687;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 8c80db297..3b16f68ea 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -12,52 +12,52 @@
     port:
     tag:
       - latest:
-          slave: lf-virtual1-6
-      - leguer:
-          slave: lf-virtual1-5
-      - kali:
-          slave: lf-virtual1-4
-      - jerma:
-          slave: lf-virtual1-3
-      - iruya:
-          slave: lf-virtual1-2
-      - hunter:
-          slave: lf-virtual1-1
+          node: lf-virtual1-9
+      - 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:
-          slave: lf-virtual1-6
-      - arm-leguer:
-          slave: lf-virtual1-5
-      - arm-kali:
-          slave: lf-virtual1-4
-      - arm-jerma:
-          slave: lf-virtual1-3
-      - arm-iruya:
-          slave: lf-virtual1-2
-      - arm-hunter:
-          slave: lf-virtual1-1
+          node: lf-virtual1-9
+      - 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:
-          slave: lf-virtual1-6
-      - arm64-leguer:
-          slave: lf-virtual1-5
-      - arm64-kali:
-          slave: lf-virtual1-4
-      - arm64-jerma:
-          slave: lf-virtual1-3
-      - arm64-iruya:
-          slave: lf-virtual1-2
-      - arm64-hunter:
-          slave: lf-virtual1-1
+          node: lf-virtual1-9
+      - 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
@@ -77,7 +77,12 @@
     <<: *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
@@ -98,6 +103,21 @@
     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
+          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}
@@ -106,20 +126,23 @@
           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 \
-            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image run_tests -t {test} -p -r
 
 - builder:
@@ -139,8 +162,8 @@
 - job-template:
     name: 'functest-kubernetes-pi-{repo}-{container}-{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
@@ -183,8 +206,8 @@
 - job-template:
     name: 'functest-kubernetes-pi-{repo}-{container}-{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
@@ -225,10 +248,10 @@
       - '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}'
+      - functest-kubernetes-pi-node:
+          node: '{node}'
       - functest-kubernetes-pi-build_tag:
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
@@ -240,22 +263,48 @@
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck'
     <<: *functest-kubernetes-pi-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
+    published_ports:
     container: 'functest-kubernetes-healthcheck'
     test:
       - k8s_quick
       - k8s_smoke
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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-node:
+          node: '{node}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+    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
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+    published_ports:
     container: 'functest-kubernetes-smoke'
     test:
       - xrally_kubernetes
-      - k8s_io
       - k8s_conformance
       - k8s_conformance_serial
       - sig_api_machinery
@@ -263,188 +312,42 @@
       - sig_apps
       - sig_apps_serial
       - sig_auth
-      - sig_cli
-      - sig_cli_serial
       - sig_cluster_lifecycle
       - sig_instrumentation
       - sig_network
-      - sig_network_serial
       - sig_node
-      - sig_node_serial
       - sig_scheduling_serial
       - sig_storage
       - sig_storage_serial
     privileged: 'false'
     network: bridge
-    exclude:
-      - {'tag': 'jerma', 'test': 'k8s_io'}
-      - {'tag': 'jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'jerma', 'test': 'sig_apps'}
-      - {'tag': 'jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'jerma', 'test': 'sig_auth'}
-      - {'tag': 'jerma', 'test': 'sig_cli'}
-      - {'tag': 'jerma', 'test': 'sig_cli_serial'}
-      - {'tag': 'jerma', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'jerma', 'test': 'sig_instrumentation'}
-      - {'tag': 'jerma', 'test': 'sig_network'}
-      - {'tag': 'jerma', 'test': 'sig_network_serial'}
-      - {'tag': 'jerma', 'test': 'sig_node'}
-      - {'tag': 'jerma', 'test': 'sig_node_serial'}
-      - {'tag': 'jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'jerma', 'test': 'sig_storage'}
-      - {'tag': 'jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'iruya', 'test': 'k8s_io'}
-      - {'tag': 'iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'iruya', 'test': 'sig_apps'}
-      - {'tag': 'iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'iruya', 'test': 'sig_auth'}
-      - {'tag': 'iruya', 'test': 'sig_cli'}
-      - {'tag': 'iruya', 'test': 'sig_cli_serial'}
-      - {'tag': 'iruya', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'iruya', 'test': 'sig_instrumentation'}
-      - {'tag': 'iruya', 'test': 'sig_network'}
-      - {'tag': 'iruya', 'test': 'sig_network_serial'}
-      - {'tag': 'iruya', 'test': 'sig_node'}
-      - {'tag': 'iruya', 'test': 'sig_node_serial'}
-      - {'tag': 'iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'iruya', 'test': 'sig_storage'}
-      - {'tag': 'iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'hunter', 'test': 'k8s_io'}
-      - {'tag': 'hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'hunter', 'test': 'sig_apps'}
-      - {'tag': 'hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'hunter', 'test': 'sig_auth'}
-      - {'tag': 'hunter', 'test': 'sig_cli'}
-      - {'tag': 'hunter', 'test': 'sig_cli_serial'}
-      - {'tag': 'hunter', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'hunter', 'test': 'sig_instrumentation'}
-      - {'tag': 'hunter', 'test': 'sig_network'}
-      - {'tag': 'hunter', 'test': 'sig_network_serial'}
-      - {'tag': 'hunter', 'test': 'sig_node'}
-      - {'tag': 'hunter', 'test': 'sig_node_serial'}
-      - {'tag': 'hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'hunter', 'test': 'sig_storage'}
-      - {'tag': 'hunter', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm-jerma', 'test': 'k8s_io'}
-      - {'tag': 'arm-jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_apps'}
-      - {'tag': 'arm-jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_auth'}
-      - {'tag': 'arm-jerma', 'test': 'sig_cli'}
-      - {'tag': 'arm-jerma', 'test': 'sig_cli_serial'}
-      - {'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_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_node'}
-      - {'tag': 'arm-jerma', 'test': 'sig_node_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm-jerma', 'test': 'sig_storage'}
-      - {'tag': 'arm-jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm-iruya', 'test': 'k8s_io'}
-      - {'tag': 'arm-iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_apps'}
-      - {'tag': 'arm-iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_auth'}
-      - {'tag': 'arm-iruya', 'test': 'sig_cli'}
-      - {'tag': 'arm-iruya', 'test': 'sig_cli_serial'}
-      - {'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_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_node'}
-      - {'tag': 'arm-iruya', 'test': 'sig_node_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm-iruya', 'test': 'sig_storage'}
-      - {'tag': 'arm-iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm-hunter', 'test': 'k8s_io'}
-      - {'tag': 'arm-hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_apps'}
-      - {'tag': 'arm-hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_auth'}
-      - {'tag': 'arm-hunter', 'test': 'sig_cli'}
-      - {'tag': 'arm-hunter', 'test': 'sig_cli_serial'}
-      - {'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_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_node'}
-      - {'tag': 'arm-hunter', 'test': 'sig_node_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm-hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm-hunter', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'k8s_io'}
-      - {'tag': 'arm64-jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_apps'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_auth'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_cli'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_cli_serial'}
-      - {'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_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_node'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_node_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_storage'}
-      - {'tag': 'arm64-jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'k8s_io'}
-      - {'tag': 'arm64-iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_apps'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_auth'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_cli'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_cli_serial'}
-      - {'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_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_node'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_node_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_storage'}
-      - {'tag': 'arm64-iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'k8s_io'}
-      - {'tag': 'arm64-hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_apps'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_auth'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_cli'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_cli_serial'}
-      - {'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_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_node'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_node_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm64-hunter', 'test': 'sig_storage_serial'}
+    uid: 1000
+    gid: 1000
     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-node:
+          node: '{node}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+    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
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+    published_ports:
     container: 'functest-kubernetes-security'
     test:
       - kube_hunter
@@ -452,39 +355,98 @@
       - kube_bench_node
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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-node:
+          node: '{node}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+    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
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+    published_ports:
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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-node:
+          node: '{node}'
+      - functest-kubernetes-pi-build_tag:
+          build_tag: ''
+      - functest-kubernetes-pi-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+    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
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+    published_ports:
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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
+          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}
@@ -493,24 +455,27 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
+            $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 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:
     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:
@@ -518,11 +483,24 @@
     builders:
       - functest-kubernetes-pi-zip:
           <<: *functest-kubernetes-pi-containers
+          volumes: '{volumes}'
+          env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
+          published_ports: '{published_ports}'
 
 - project:
     name: 'functest-kubernetes-pi-{tag}-zip'
     <<: *functest-kubernetes-pi-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
+    published_ports:
     container: 'functest-kubernetes-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-pi-{tag}-zip'
 
@@ -532,18 +510,21 @@
     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
+    # 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-)*.*-(daily|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-docker$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -584,8 +565,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'
@@ -600,22 +579,14 @@
               <<: *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_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_node_serial-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'
@@ -636,6 +607,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:
@@ -643,13 +616,19 @@
               <<: *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
           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'