Finish updating Jenkins jobs
[releng.git] / jjb / functest / functest-pi.yaml
index f05e256..f9a5ab5 100644 (file)
@@ -8,7 +8,317 @@
 
 - functest-pi-params: &functest-pi-params
     name: 'functest-pi-params'
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-healthcheck-params: &functest-pi-ollivier-functest-healthcheck-params
+    name: 'functest-pi-ollivier-functest-healthcheck-params'
+    repo: 'ollivier'
+    container: 'functest-healthcheck'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-smoke-params: &functest-pi-ollivier-functest-smoke-params
+    name: 'functest-pi-ollivier-functest-smoke-params'
+    repo: 'ollivier'
+    container: 'functest-smoke'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-smoke-cntt-params: &functest-pi-ollivier-functest-smoke-cntt-params
+    name: 'functest-pi-ollivier-functest-smoke-cntt-params'
+    repo: 'ollivier'
+    container: 'functest-smoke-cntt'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-benchmarking-params: &functest-pi-ollivier-functest-benchmarking-params
+    name: 'functest-pi-ollivier-functest-benchmarking-params'
     repo: 'ollivier'
+    container: 'functest-benchmarking'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-benchmarking-cntt-params: &functest-pi-ollivier-functest-benchmarking-cntt-params
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-params'
+    repo: 'ollivier'
+    container: 'functest-benchmarking-cntt'
+    port:
+    tag:
+      - latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - xena-latest:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+      - arm64-yoga:
+          node: lf-pod4-3
+          DASHBOARD_URL: http://172.30.12.88
+      - arm64-xena:
+          node: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
+      - arm64-wallaby:
+          node: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
+
+- functest-pi-ollivier-functest-vnf-params: &functest-pi-ollivier-functest-vnf-params
+    name: 'functest-pi-ollivier-functest-vnf-params'
+    repo: 'ollivier'
+    container: 'functest-vnf'
     port:
     tag:
       - latest:
 - functest-pi-run-containers: &functest-pi-run-containers
     name: 'functest-pi-run-containers'
     <<: *functest-pi-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'functest-pi-{repo}-{container}-{tag}-pull'
+    name: 'functest-pi-ollivier-functest-healthcheck-{tag}-pull'
     parameters:
       - functest-pi-node:
           node: '{node}'
 
 - project:
     name: 'functest-pi-ollivier-functest-healthcheck-pull'
-    <<: *functest-pi-params
-    container: 'functest-healthcheck'
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-healthcheck-{tag}-pull'
 
-- project:
-    name: 'functest-pi-ollivier-functest-smoke-pull'
-    <<: *functest-pi-params
-    container: 'functest-smoke'
-    jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+- job-template:
+    name: 'functest-pi-ollivier-functest-healthcheck-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-smoke-cntt-pull'
-    <<: *functest-pi-params
-    container: 'functest-smoke-cntt'
+    name: 'functest-pi-ollivier-functest-healthcheck-rmi'
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-healthcheck-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-benchmarking-pull'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking'
+    name: 'functest-pi-ollivier-functest-smoke-pull'
+    <<: *functest-pi-ollivier-functest-smoke-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-smoke-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-benchmarking-cntt-pull'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking-cntt'
+    name: 'functest-pi-ollivier-functest-smoke-rmi'
+    <<: *functest-pi-ollivier-functest-smoke-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-smoke-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-vnf-pull'
-    <<: *functest-pi-params
-    container: 'functest-vnf'
+    name: 'functest-pi-ollivier-functest-smoke-cntt-pull'
+    <<: *functest-pi-ollivier-functest-smoke-cntt-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-pull'
+      - 'functest-pi-ollivier-functest-smoke-cntt-{tag}-pull'
 
 - job-template:
-    name: 'functest-pi-{repo}-{container}-{tag}-rmi'
+    name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-rmi'
     parameters:
       - functest-pi-node:
           node: '{node}'
           <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-healthcheck-rmi'
-    <<: *functest-pi-params
-    container: 'functest-healthcheck'
+    name: 'functest-pi-ollivier-functest-smoke-cntt-rmi'
+    <<: *functest-pi-ollivier-functest-smoke-cntt-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-smoke-cntt-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-smoke-rmi'
-    <<: *functest-pi-params
-    container: 'functest-smoke'
+    name: 'functest-pi-ollivier-functest-benchmarking-pull'
+    <<: *functest-pi-ollivier-functest-benchmarking-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-benchmarking-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-smoke-cntt-rmi'
-    <<: *functest-pi-params
-    container: 'functest-smoke-cntt'
+    name: 'functest-pi-ollivier-functest-benchmarking-rmi'
+    <<: *functest-pi-ollivier-functest-benchmarking-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-benchmarking-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
 
 - project:
-    name: 'functest-pi-ollivier-functest-benchmarking-rmi'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking'
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-pull'
+    <<: *functest-pi-ollivier-functest-benchmarking-cntt-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking-cntt-rmi'
-    <<: *functest-pi-params
-    container: 'functest-benchmarking-cntt'
+    <<: *functest-pi-ollivier-functest-benchmarking-cntt-params
+    jobs:
+      - 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-rmi'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-vnf-{tag}-pull'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-pull-containers:
+          <<: *functest-pi-containers
+
+- project:
+    name: 'functest-pi-ollivier-functest-vnf-pull'
+    <<: *functest-pi-ollivier-functest-vnf-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-vnf-{tag}-pull'
+
+- job-template:
+    name: 'functest-pi-ollivier-functest-vnf-{tag}-rmi'
+    parameters:
+      - functest-pi-node:
+          node: '{node}'
+    builders:
+      - functest-pi-remove-images:
+          <<: *functest-pi-containers
 
 - project:
     name: 'functest-pi-ollivier-functest-vnf-rmi'
-    <<: *functest-pi-params
-    container: 'functest-vnf'
+    <<: *functest-pi-ollivier-functest-vnf-params
     jobs:
-      - 'functest-pi-{repo}-{container}-{tag}-rmi'
+      - 'functest-pi-ollivier-functest-vnf-{tag}-rmi'
 
 - job-template:
     name: 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run'
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-healthcheck'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-smoke'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-smoke-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-smoke-cntt'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-smoke-cntt-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-benchmarking-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-benchmarking-cntt'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-benchmarking-cntt-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
     builders:
       - functest-pi-run-containers:
           <<: *functest-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'functest-pi-ollivier-functest-vnf'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-vnf-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
           sudo mkdir -p $WORKSPACE/results
           sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
             -v /home/opnfv/functest/.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 \
+            -e DASHBOARD_URL={DASHBOARD_URL} \
             $image zip_campaign
 
 - job-template:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     builders:
       - functest-pi-zip:
-          <<: *functest-pi-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *functest-pi-run-containers
 
 - project:
     name: 'functest-pi-{tag}-zip'
-    <<: *functest-pi-params
+    <<: *functest-pi-ollivier-functest-healthcheck-params
     volumes:
       - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
       - /home/opnfv/functest/images:/home/opnfv/functest/images
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     published_ports:
     container: 'functest-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs: