Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Align Xtesting based jobs with latest XtestingCI changes
[releng.git] / jjb / functest / functest-pi.yaml
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 3daf9b1..1ac14f5 100644 (file)
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -8,74 +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
+          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:
-          slave: laas-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
+      - 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
-      - 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
-      - kali:
-          slave: lf-pod4-3
+      - arm64-yoga:
+          node: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
-      - 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-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
+          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:
-          slave: laas-xena
+          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
+          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:
-          slave: laas-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
+
+- 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:
+          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
-      - arm64-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
-      - 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
@@ -107,7 +408,6 @@
 - functest-pi-run-containers: &functest-pi-run-containers
     name: 'functest-pi-run-containers'
     <<: *functest-pi-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -173,7 +473,7 @@
             -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} \
@@ -194,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-{repo}-{container}-{tag}-rmi'
+      - '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-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:
@@ -311,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
@@ -348,8 +727,8 @@
 - 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:
@@ -361,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
@@ -381,19 +761,15 @@
       - 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
@@ -401,189 +777,14 @@
     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: 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-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:
@@ -595,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
@@ -627,8 +829,8 @@
 - 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:
@@ -640,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
@@ -668,8 +871,8 @@
 - 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:
@@ -681,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
@@ -707,8 +911,8 @@
 - 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:
@@ -720,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
@@ -777,6 +982,8 @@
           sudo mkdir -p $WORKSPACE/results
           sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
@@ -786,15 +993,17 @@
             -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:
@@ -805,16 +1014,11 @@
           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
+    name: 'functest-pi-zip'
+    <<: *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
@@ -824,6 +1028,8 @@
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     published_ports:
     container: 'functest-healthcheck'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
@@ -835,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:
@@ -928,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'
@@ -942,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'