X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-pi.yaml;h=f9a5ab5edba04e1a63c7de394327da94623955fa;hb=94894ae211bd21a309c46a7eb3c86118ae78b673;hp=663810ce0615c3a54208b308a186a2121fecccb8;hpb=202f80f45c6fa8700e06a01e2c682099b28eccc5;p=releng.git

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 663810ce0..f9a5ab5ed 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -8,65 +8,375 @@
 
 - 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:
-          slave: lf-pod4-2
-          DASHBOARD_URL: http://172.30.12.85
+          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:
-          slave: lf-virtual6
+          node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
-      - leguer:
-          slave: lf-virtual9
+      - arm-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm-zed:
+          node: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
-      - kali:
-          slave: lf-pod4-3
+      - arm-yoga:
+          node: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
-      - jerma:
-          slave: lf-pod4
+      - 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:
-          slave: lf-pod4-2
-          DASHBOARD_URL: http://172.30.12.85
+          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:
-          slave: lf-virtual6
+          node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
-      - arm-leguer:
-          slave: lf-virtual9
+      - arm64-latest:
+          node: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
+      - arm64-zed:
+          node: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
-      - arm-kali:
-          slave: lf-pod4-3
+      - arm64-yoga:
+          node: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
-      - arm-jerma:
-          slave: lf-pod4
+      - 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:
-          slave: lf-pod4-2
-          DASHBOARD_URL: http://172.30.12.85
+          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:
-          slave: lf-virtual6
+          node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
-      - arm64-leguer:
-          slave: lf-virtual9
+
+- 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:
+          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
-      - arm64-kali:
-          slave: lf-pod4-3
+      - arm-yoga:
+          node: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
-      - arm64-jerma:
-          slave: lf-pod4
+      - 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-jobs: &functest-pi-jobs
     name: 'functest-pi-jobs'
     current-parameters: true
 
 - parameter:
-    name: functest-pi-slave
+    name: functest-pi-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: functest-pi-build_tag
@@ -98,11 +408,13 @@
 - functest-pi-run-containers: &functest-pi-run-containers
     name: 'functest-pi-run-containers'
     <<: *functest-pi-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
+    published_ports: '{published_ports}'
     DASHBOARD_URL: '{DASHBOARD_URL}'
 
 - builder:
@@ -124,8 +436,21 @@
     builders:
       - shell: |
           set +x
-          volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
-          env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          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" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -134,18 +459,21 @@
           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 \
+            $published_ports \
             -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 \
-            -v /home/opnfv/functest/.boto:/root/.boto \
+            -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=$slave \
+            -e NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DASHBOARD_URL={DASHBOARD_URL} \
@@ -166,112 +494,190 @@
           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-slave:
-          slave: '{slave}'
+      - functest-pi-node:
+          node: '{node}'
     builders:
       - functest-pi-pull-containers:
           <<: *functest-pi-containers
 
 - 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-slave:
-          slave: '{slave}'
+      - functest-pi-node:
+          node: '{node}'
     builders:
       - functest-pi-remove-images:
           <<: *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'
     parameters:
-      - functest-pi-slave:
-          slave: '{slave}'
+      - functest-pi-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -283,10 +689,11 @@
     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
@@ -294,6 +701,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-healthcheck'
     test:
       - connection_check
@@ -311,14 +719,16 @@
       - tempest_horizon
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -330,10 +740,11 @@
     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
@@ -341,6 +752,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-smoke'
     test:
       - tempest_neutron
@@ -349,183 +761,30 @@
       - tempest_heat
       - tempest_telemetry
       - rally_sanity
-      - refstack_defcore
       - refstack_compute
       - refstack_object
       - refstack_platform
       - tempest_full
       - tempest_scenario
       - tempest_slow
-      - patrole
       - patrole_admin
       - patrole_member
       - patrole_reader
-      - networking-bgpvpn
-      - networking-sfc
       - tempest_barbican
       - tempest_octavia
       - tempest_cyborg
     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: 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
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -537,10 +796,11 @@
     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
@@ -548,6 +808,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-smoke-cntt'
     test:
       - tempest_neutron_cntt
@@ -560,14 +821,16 @@
       - tempest_slow_cntt
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -579,10 +842,11 @@
     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
@@ -590,6 +854,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-benchmarking'
     test:
       - rally_full
@@ -598,14 +863,16 @@
       - shaker
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -617,10 +884,11 @@
     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
@@ -628,20 +896,23 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-benchmarking-cntt'
     test:
       - rally_full_cntt
       - rally_jobs_cntt
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - '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-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -653,10 +924,11 @@
     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
@@ -664,6 +936,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-vnf'
     test:
       - cloudify
@@ -673,6 +946,8 @@
       - juju_epc
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run'
 
@@ -681,8 +956,21 @@
     builders:
       - shell: |
           set +x
-          volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
-          env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          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" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -691,24 +979,31 @@
           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 \
+            $published_ports \
             -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 \
-            -v /home/opnfv/functest/.boto:/root/.boto \
+            -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:
     name: 'functest-pi-{tag}-zip'
     parameters:
-      - functest-pi-slave:
-          slave: '{slave}'
+      - functest-pi-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -719,13 +1014,11 @@
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
     builders:
       - functest-pi-zip:
-          <<: *functest-pi-containers
-          volumes: '{volumes}'
-          env: '{env}'
+          <<: *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
@@ -733,7 +1026,12 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-healthcheck'
+    privileged: 'false'
+    network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-pi-{tag}-zip'
 
@@ -743,8 +1041,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-pi-slave:
-          slave: '{slave}'
+      - functest-pi-node:
+          node: '{node}'
       - functest-pi-build_tag:
           build_tag: ''
       - functest-pi-EXTERNAL_NETWORK:
@@ -836,8 +1134,6 @@
               <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-pi-jobs
-            - name: 'functest-pi-ollivier-functest-smoke-{tag}-refstack_defcore-run'
-              <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-refstack_compute-run'
               <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-refstack_object-run'
@@ -850,18 +1146,12 @@
               <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-tempest_slow-run'
               <<: *functest-pi-jobs
-            - name: 'functest-pi-ollivier-functest-smoke-{tag}-patrole-run'
-              <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-patrole_admin-run'
               <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-patrole_member-run'
               <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-pi-jobs
-            - name: 'functest-pi-ollivier-functest-smoke-{tag}-networking-bgpvpn-run'
-              <<: *functest-pi-jobs
-            - name: 'functest-pi-ollivier-functest-smoke-{tag}-networking-sfc-run'
-              <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-tempest_barbican-run'
               <<: *functest-pi-jobs
             - name: 'functest-pi-ollivier-functest-smoke-{tag}-tempest_octavia-run'
@@ -923,6 +1213,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'