Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fix download campaign builder
[releng.git] / jjb / functest / functest-pi.yaml
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 3220ac4..39018c5 100644 (file)
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -12,8 +12,11 @@
     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
@@ -27,8 +30,11 @@
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
       - arm-latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          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
@@ -42,8 +48,11 @@
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
       - arm64-latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          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
@@ -80,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:
@@ -98,7 +109,11 @@
     <<: *functest-pi-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
     DASHBOARD_URL: '{DASHBOARD_URL}'
 
 - builder:
@@ -120,6 +135,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}
@@ -128,9 +153,13 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           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 \
@@ -140,12 +169,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:
@@ -265,7 +289,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}'
@@ -284,6 +308,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
@@ -301,12 +332,38 @@
       - tempest_horizon
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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
@@ -333,88 +390,213 @@
       - tempest_cyborg
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     exclude:
-      - {'tag': 'latest', 'test': 'refstack_defcore'}
-      - {'tag': 'latest', 'test': 'networking-bgpvpn'}
-      - {'tag': 'latest', 'test': 'networking-sfc'}
-      - {'tag': 'latest', '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-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-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'}
+      - 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
@@ -427,12 +609,38 @@
       - tempest_slow_cntt
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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
@@ -441,24 +649,76 @@
       - shaker
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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
       - rally_jobs_cntt
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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
@@ -468,15 +728,26 @@
       - juju_epc
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     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}
@@ -485,7 +756,11 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           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 \
@@ -494,11 +769,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:
@@ -517,11 +787,24 @@
     builders:
       - functest-pi-zip:
           <<: *functest-pi-containers
+          volumes: '{volumes}'
+          env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - 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'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-pi-{tag}-zip'
 
@@ -541,12 +824,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
@@ -709,6 +994,12 @@
           projects:
             - name: 'functest-pi-{tag}-zip'
               <<: *functest-pi-jobs
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-pi-daily'