X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-pi.yaml;h=ba8a3d0c0daedacb46736a24bb105a9e0e4f8747;hb=refs%2Fchanges%2F66%2F72966%2F1;hp=78635d7c8e7257170324191e0438a4a45935f04f;hpb=88113b1e5696f86070db68f9fefdf6a2b21ba7f9;p=releng.git

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 78635d7c8..ba8a3d0c0 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -12,8 +12,14 @@
     port:
     tag:
       - latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - xena:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
       - leguer:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -23,15 +29,15 @@
       - jerma:
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
-      - iruya:
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-      - hunter:
+      - arm-latest:
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - xena-latest:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
-      - arm-latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
       - arm-leguer:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -41,15 +47,15 @@
       - arm-jerma:
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
-      - arm-iruya:
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-      - arm-hunter:
+      - arm64-latest:
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - arm64-xena:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
-      - arm64-latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
       - arm64-leguer:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -59,12 +65,6 @@
       - arm64-jerma:
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
-      - arm64-iruya:
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-      - arm64-hunter:
-          slave: lf-virtual6
-          DASHBOARD_URL: http://172.30.13.91
 
 - functest-pi-jobs: &functest-pi-jobs
     name: 'functest-pi-jobs'
@@ -89,12 +89,14 @@
       - string:
           name: EXTERNAL_NETWORK
           default: public
+
 - parameter:
     name: functest-pi-VOLUME_DEVICE_NAME
     parameters:
       - string:
           name: VOLUME_DEVICE_NAME
           default: sdb
+
 - parameter:
     name: functest-pi-IMAGE_PROPERTIES
     parameters:
@@ -107,6 +109,8 @@
     <<: *functest-pi-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
     DASHBOARD_URL: '{DASHBOARD_URL}'
 
@@ -129,6 +133,16 @@
     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" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -140,6 +154,8 @@
           sudo 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/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -149,12 +165,7 @@
             -e NODE_NAME=$slave \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
-            -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
-            -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
             -e DASHBOARD_URL={DASHBOARD_URL} \
-            -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-            -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             $image run_tests -t {test} -p -r
 
 - builder:
@@ -274,7 +285,7 @@
       - 'functest-pi-{repo}-{container}-{tag}-rmi'
 
 - job-template:
-    name: 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+    name: 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run'
     parameters:
       - functest-pi-slave:
           slave: '{slave}'
@@ -293,6 +304,13 @@
 - project:
     name: 'functest-pi-ollivier-functest-healthcheck'
     <<: *functest-pi-params
+    volumes:
+      - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+      - /home/opnfv/functest/images:/home/opnfv/functest/images
+    env:
+      - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+      - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+      - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-healthcheck'
     test:
       - connection_check
@@ -311,11 +329,35 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-{tag}-{test}-run'
+    parameters:
+      - functest-pi-slave:
+          slave: '{slave}'
+      - functest-pi-build_tag:
+          build_tag: ''
+      - functest-pi-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
+      - functest-pi-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-pi-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+    builders:
+      - functest-pi-run-containers:
+          <<: *functest-pi-run-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-smoke'
     <<: *functest-pi-params
+    volumes:
+      - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+      - /home/opnfv/functest/images:/home/opnfv/functest/images
+    env:
+      - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+      - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+      - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-smoke'
     test:
       - tempest_neutron
@@ -343,117 +385,210 @@
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'latest', 'test': 'refstack_defcore'}
-      - {'tag': 'latest', 'test': 'networking-bgpvpn'}
-      - {'tag': 'latest', 'test': 'networking-sfc'}
-      - {'tag': 'latest', 'test': 'patrole'}
-      - {'tag': 'leguer', 'test': 'refstack_defcore'}
-      - {'tag': 'leguer', 'test': 'networking-bgpvpn'}
-      - {'tag': 'leguer', 'test': 'networking-sfc'}
-      - {'tag': 'leguer', 'test': 'patrole'}
-      - {'tag': 'kali', 'test': 'refstack_defcore'}
-      - {'tag': 'kali', 'test': 'networking-bgpvpn'}
-      - {'tag': 'kali', 'test': 'networking-sfc'}
-      - {'tag': 'kali', 'test': 'patrole_admin'}
-      - {'tag': 'kali', 'test': 'patrole_member'}
-      - {'tag': 'kali', 'test': 'patrole_reader'}
-      - {'tag': 'jerma', 'test': 'refstack_defcore'}
-      - {'tag': 'jerma', 'test': 'networking-bgpvpn'}
-      - {'tag': 'jerma', 'test': 'networking-sfc'}
-      - {'tag': 'jerma', 'test': 'patrole_admin'}
-      - {'tag': 'jerma', 'test': 'patrole_member'}
-      - {'tag': 'jerma', 'test': 'patrole_reader'}
-      - {'tag': 'jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'iruya', 'test': 'patrole_admin'}
-      - {'tag': 'iruya', 'test': 'patrole_member'}
-      - {'tag': 'iruya', 'test': 'patrole_reader'}
-      - {'tag': 'iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'hunter', 'test': 'refstack_compute'}
-      - {'tag': 'hunter', 'test': 'refstack_object'}
-      - {'tag': 'hunter', 'test': 'refstack_platform'}
-      - {'tag': 'hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'hunter', 'test': 'patrole_admin'}
-      - {'tag': 'hunter', 'test': 'patrole_member'}
-      - {'tag': 'hunter', 'test': 'patrole_reader'}
-      - {'tag': 'hunter', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm-latest', 'test': 'refstack_defcore'}
-      - {'tag': 'arm-latest', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm-latest', 'test': 'networking-sfc'}
-      - {'tag': 'arm-latest', 'test': 'patrole'}
-      - {'tag': 'arm-leguer', 'test': 'refstack_defcore'}
-      - {'tag': 'arm-leguer', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm-leguer', 'test': 'networking-sfc'}
-      - {'tag': 'arm-leguer', 'test': 'patrole'}
-      - {'tag': 'arm-kali', 'test': 'refstack_defcore'}
-      - {'tag': 'arm-kali', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm-kali', 'test': 'networking-sfc'}
-      - {'tag': 'arm-kali', 'test': 'patrole_admin'}
-      - {'tag': 'arm-kali', 'test': 'patrole_member'}
-      - {'tag': 'arm-kali', 'test': 'patrole_reader'}
-      - {'tag': 'arm-jerma', 'test': 'refstack_defcore'}
-      - {'tag': 'arm-jerma', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm-jerma', 'test': 'networking-sfc'}
-      - {'tag': 'arm-jerma', 'test': 'patrole_admin'}
-      - {'tag': 'arm-jerma', 'test': 'patrole_member'}
-      - {'tag': 'arm-jerma', 'test': 'patrole_reader'}
-      - {'tag': 'arm-jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm-iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_admin'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_member'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_reader'}
-      - {'tag': 'arm-iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_compute'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_object'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_platform'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_admin'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_member'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_reader'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm64-latest', 'test': 'refstack_defcore'}
-      - {'tag': 'arm64-latest', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm64-latest', 'test': 'networking-sfc'}
-      - {'tag': 'arm64-latest', 'test': 'patrole'}
-      - {'tag': 'arm64-leguer', 'test': 'refstack_defcore'}
-      - {'tag': 'arm64-leguer', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm64-leguer', 'test': 'networking-sfc'}
-      - {'tag': 'arm64-leguer', 'test': 'patrole'}
-      - {'tag': 'arm64-kali', 'test': 'refstack_defcore'}
-      - {'tag': 'arm64-kali', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm64-kali', 'test': 'networking-sfc'}
-      - {'tag': 'arm64-kali', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-kali', 'test': 'patrole_member'}
-      - {'tag': 'arm64-kali', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-jerma', 'test': 'refstack_defcore'}
-      - {'tag': 'arm64-jerma', 'test': 'networking-bgpvpn'}
-      - {'tag': 'arm64-jerma', 'test': 'networking-sfc'}
-      - {'tag': 'arm64-jerma', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-jerma', 'test': 'patrole_member'}
-      - {'tag': 'arm64-jerma', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm64-iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_member'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_compute'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_object'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_platform'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_member'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_cyborg'}
+      - tag: latest
+        test: refstack_defcore
+      - tag: latest
+        test: networking-bgpvpn
+      - tag: latest
+        test: networking-sfc
+      - tag: latest
+        test: patrole
+      - tag: xena
+        test: refstack_defcore
+      - tag: xena
+        test: networking-bgpvpn
+      - tag: xena
+        test: networking-sfc
+      - tag: xena
+        test: patrole
+      - tag: wallaby
+        test: refstack_defcore
+      - tag: wallaby
+        test: networking-bgpvpn
+      - tag: wallaby
+        test: networking-sfc
+      - tag: wallaby
+        test: patrole
+      - tag: leguer
+        test: refstack_defcore
+      - tag: leguer
+        test: networking-bgpvpn
+      - tag: leguer
+        test: networking-sfc
+      - tag: leguer
+        test: patrole
+      - tag: kali
+        test: refstack_defcore
+      - tag: kali
+        test: networking-bgpvpn
+      - tag: kali
+        test: networking-sfc
+      - tag: kali
+        test: patrole_admin
+      - tag: kali
+        test: patrole_member
+      - tag: kali
+        test: patrole_reader
+      - tag: jerma
+        test: refstack_defcore
+      - tag: jerma
+        test: networking-bgpvpn
+      - tag: jerma
+        test: networking-sfc
+      - tag: jerma
+        test: patrole_admin
+      - tag: jerma
+        test: patrole_member
+      - tag: jerma
+        test: patrole_reader
+      - tag: jerma
+        test: tempest_cyborg
+      - tag: arm-latest
+        test: refstack_defcore
+      - tag: arm-latest
+        test: networking-bgpvpn
+      - tag: arm-latest
+        test: networking-sfc
+      - tag: arm-latest
+        test: patrole
+      - tag: arm-xena
+        test: refstack_defcore
+      - tag: arm-xena
+        test: networking-bgpvpn
+      - tag: arm-xena
+        test: networking-sfc
+      - tag: arm-xena
+        test: patrole
+      - tag: arm-wallaby
+        test: refstack_defcore
+      - tag: arm-wallaby
+        test: networking-bgpvpn
+      - tag: arm-wallaby
+        test: networking-sfc
+      - tag: arm-wallaby
+        test: patrole
+      - tag: arm-leguer
+        test: refstack_defcore
+      - tag: arm-leguer
+        test: networking-bgpvpn
+      - tag: arm-leguer
+        test: networking-sfc
+      - tag: arm-leguer
+        test: patrole
+      - tag: arm-kali
+        test: refstack_defcore
+      - tag: arm-kali
+        test: networking-bgpvpn
+      - tag: arm-kali
+        test: networking-sfc
+      - tag: arm-kali
+        test: patrole_admin
+      - tag: arm-kali
+        test: patrole_member
+      - tag: arm-kali
+        test: patrole_reader
+      - tag: arm-jerma
+        test: refstack_defcore
+      - tag: arm-jerma
+        test: networking-bgpvpn
+      - tag: arm-jerma
+        test: networking-sfc
+      - tag: arm-jerma
+        test: patrole_admin
+      - tag: arm-jerma
+        test: patrole_member
+      - tag: arm-jerma
+        test: patrole_reader
+      - tag: arm-jerma
+        test: tempest_cyborg
+      - tag: arm64-latest
+        test: refstack_defcore
+      - tag: arm64-latest
+        test: networking-bgpvpn
+      - tag: arm64-latest
+        test: networking-sfc
+      - tag: arm64-latest
+        test: patrole
+      - tag: arm64-xena
+        test: refstack_defcore
+      - tag: arm64-xena
+        test: networking-bgpvpn
+      - tag: arm64-xena
+        test: networking-sfc
+      - tag: arm64-xena
+        test: patrole
+      - tag: arm64-wallaby
+        test: refstack_defcore
+      - tag: arm64-wallaby
+        test: networking-bgpvpn
+      - tag: arm64-wallaby
+        test: networking-sfc
+      - tag: arm64-wallaby
+        test: patrole
+      - tag: arm64-leguer
+        test: refstack_defcore
+      - tag: arm64-leguer
+        test: networking-bgpvpn
+      - tag: arm64-leguer
+        test: networking-sfc
+      - tag: arm64-leguer
+        test: patrole
+      - tag: arm64-kali
+        test: refstack_defcore
+      - tag: arm64-kali
+        test: networking-bgpvpn
+      - tag: arm64-kali
+        test: networking-sfc
+      - tag: arm64-kali
+        test: patrole_admin
+      - tag: arm64-kali
+        test: patrole_member
+      - tag: arm64-kali
+        test: patrole_reader
+      - tag: arm64-jerma
+        test: refstack_defcore
+      - tag: arm64-jerma
+        test: networking-bgpvpn
+      - tag: arm64-jerma
+        test: networking-sfc
+      - tag: arm64-jerma
+        test: patrole_admin
+      - tag: arm64-jerma
+        test: patrole_member
+      - tag: arm64-jerma
+        test: patrole_reader
+      - tag: arm64-jerma
+        test: tempest_cyborg
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-pi-ollivier-functest-smoke-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-{test}-run'
+    parameters:
+      - functest-pi-slave:
+          slave: '{slave}'
+      - functest-pi-build_tag:
+          build_tag: ''
+      - functest-pi-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
+      - functest-pi-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-pi-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+    builders:
+      - functest-pi-run-containers:
+          <<: *functest-pi-run-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-smoke-cntt'
     <<: *functest-pi-params
+    volumes:
+      - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+      - /home/opnfv/functest/images:/home/opnfv/functest/images
+    env:
+      - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+      - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+      - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-smoke-cntt'
     test:
       - tempest_neutron_cntt
@@ -467,11 +602,35 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-pi-ollivier-functest-smoke-cntt-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-{tag}-{test}-run'
+    parameters:
+      - functest-pi-slave:
+          slave: '{slave}'
+      - functest-pi-build_tag:
+          build_tag: ''
+      - functest-pi-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
+      - functest-pi-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-pi-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+    builders:
+      - functest-pi-run-containers:
+          <<: *functest-pi-run-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking'
     <<: *functest-pi-params
+    volumes:
+      - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+      - /home/opnfv/functest/images:/home/opnfv/functest/images
+    env:
+      - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+      - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+      - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-benchmarking'
     test:
       - rally_full
@@ -481,11 +640,35 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-pi-ollivier-functest-benchmarking-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-{test}-run'
+    parameters:
+      - functest-pi-slave:
+          slave: '{slave}'
+      - functest-pi-build_tag:
+          build_tag: ''
+      - functest-pi-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
+      - functest-pi-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-pi-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+    builders:
+      - functest-pi-run-containers:
+          <<: *functest-pi-run-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking-cntt'
     <<: *functest-pi-params
+    volumes:
+      - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+      - /home/opnfv/functest/images:/home/opnfv/functest/images
+    env:
+      - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+      - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+      - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-benchmarking-cntt'
     test:
       - rally_full_cntt
@@ -493,11 +676,35 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run'
+    parameters:
+      - functest-pi-slave:
+          slave: '{slave}'
+      - functest-pi-build_tag:
+          build_tag: ''
+      - functest-pi-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
+      - functest-pi-VOLUME_DEVICE_NAME:
+          VOLUME_DEVICE_NAME: sdb
+      - functest-pi-IMAGE_PROPERTIES:
+          IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+    builders:
+      - functest-pi-run-containers:
+          <<: *functest-pi-run-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-vnf'
     <<: *functest-pi-params
+    volumes:
+      - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+      - /home/opnfv/functest/images:/home/opnfv/functest/images
+    env:
+      - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+      - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+      - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-vnf'
     test:
       - cloudify
@@ -508,14 +715,23 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
-
+      - 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run'
 
 - builder:
     name: functest-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" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -525,6 +741,8 @@
             image={repo}:{port}/{container}:{tag}
           fi
           sudo docker run --rm \
+            $volumes \
+            $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest \
@@ -533,11 +751,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 EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
-            -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
-            -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
-            -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-            -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             $image zip_campaign
 
 - job-template:
@@ -556,10 +769,19 @@
     builders:
       - functest-pi-zip:
           <<: *functest-pi-containers
+          volumes: '{volumes}'
+          env: '{env}'
 
 - project:
     name: 'functest-pi-{tag}-zip'
     <<: *functest-pi-params
+    volumes:
+      - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+      - /home/opnfv/functest/images:/home/opnfv/functest/images
+    env:
+      - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+      - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+      - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-healthcheck'
     jobs:
       - 'functest-pi-{tag}-zip'
@@ -580,12 +802,14 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-pi-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+    # 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-pi-{tag}-(daily|docker|review)$'
+          - ^functest-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images