X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-pi.yaml;h=f05e2567ea76c316307dc222f4beb6bb38da20ce;hb=913e09383a46803dcc96da4b52304a6d48421f14;hp=241884e720f2c26486cffe140e2f56d14a5c2ba0;hpb=fbbbfccd6b83c2a47f9a8ac9b71447d01c5e67a2;p=releng.git

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 241884e72..f05e2567e 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -12,70 +12,61 @@
     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:
-          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
-      - 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
-          DASHBOARD_URL: http://172.30.12.83
-      - arm-latest:
-          slave: lf-pod4-2
-          DASHBOARD_URL: http://172.30.12.85
       - 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
-          DASHBOARD_URL: http://172.30.12.83
-      - arm64-latest:
-          slave: lf-pod4-2
-          DASHBOARD_URL: http://172.30.12.85
       - 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
-      - arm64-leguer:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
-      - arm64-kali:
-          slave: lf-pod4-3
-          DASHBOARD_URL: http://172.30.12.88
-      - arm64-jerma:
-          slave: lf-pod4
-          DASHBOARD_URL: http://172.30.12.83
 
 - 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
@@ -173,7 +164,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} \
@@ -196,8 +187,8 @@
 - job-template:
     name: 'functest-pi-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-pi-slave:
-          slave: '{slave}'
+      - functest-pi-node:
+          node: '{node}'
     builders:
       - functest-pi-pull-containers:
           <<: *functest-pi-containers
@@ -247,8 +238,8 @@
 - job-template:
     name: 'functest-pi-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-pi-slave:
-          slave: '{slave}'
+      - functest-pi-node:
+          node: '{node}'
     builders:
       - functest-pi-remove-images:
           <<: *functest-pi-containers
@@ -298,8 +289,8 @@
 - 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:
@@ -348,8 +339,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:
@@ -381,19 +372,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 +388,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:
@@ -627,8 +439,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:
@@ -668,8 +480,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:
@@ -707,8 +519,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:
@@ -793,8 +605,8 @@
 - 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:
@@ -835,8 +647,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 +740,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 +752,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'