X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest-pi.yaml;h=a52f28fdbbad3969229b2aced348ffd3eaa73719;hb=377f1c236b547d4dc7762fde56009dd5086fc87e;hp=51f8df3bbb2ed63ce300aa3c0c3796e080389845;hpb=aa4722a1d16999ee50807da2f9d5866d5d863bd5;p=releng.git

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 51f8df3bb..a52f28fdb 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -1,7 +1,10 @@
 ---
-- functest-pi-jobs: &functest-pi-jobs
-    name: 'functest-pi-jobs'
-    current-parameters: true
+- functest-pi-containers: &functest-pi-containers
+    name: 'functest-pi-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - functest-pi-params: &functest-pi-params
     name: 'functest-pi-params'
@@ -9,77 +12,54 @@
     port:
     tag:
       - latest:
-          branch: master
-          slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - wallaby:
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
       - leguer:
-          branch: stable/leguer
           slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
+          DASHBOARD_URL: http://172.30.13.94
       - kali:
-          branch: stable/kali
           slave: lf-pod4-3
-          dashboard_url: http://172.30.12.88
+          DASHBOARD_URL: http://172.30.12.88
       - jerma:
-          branch: stable/jerma
           slave: lf-pod4
-          dashboard_url: http://172.30.12.83
-      - iruya:
-          branch: stable/iruya
-          slave: lf-virtual4
-          dashboard_url: http://172.30.13.89
-      - hunter:
-          branch: stable/hunter
-          slave: lf-virtual6
-          dashboard_url: http://172.30.13.91
+          DASHBOARD_URL: http://172.30.12.83
       - arm-latest:
-          branch: master
-          slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - arm-wallaby:
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
       - arm-leguer:
-          branch: stable/leguer
           slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
+          DASHBOARD_URL: http://172.30.13.94
       - arm-kali:
-          branch: stable/kali
           slave: lf-pod4-3
-          dashboard_url: http://172.30.12.88
+          DASHBOARD_URL: http://172.30.12.88
       - arm-jerma:
-          branch: stable/jerma
           slave: lf-pod4
-          dashboard_url: http://172.30.12.83
-      - arm-iruya:
-          branch: stable/iruya
-          slave: lf-virtual4
-          dashboard_url: http://172.30.13.89
-      - arm-hunter:
-          branch: stable/hunter
-          slave: lf-virtual6
-          dashboard_url: http://172.30.13.91
+          DASHBOARD_URL: http://172.30.12.83
       - arm64-latest:
-          branch: master
-          slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - arm64-wallaby:
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
       - arm64-leguer:
-          branch: stable/leguer
           slave: lf-virtual9
-          dashboard_url: http://172.30.13.94
+          DASHBOARD_URL: http://172.30.13.94
       - arm64-kali:
-          branch: stable/kali
           slave: lf-pod4-3
-          dashboard_url: http://172.30.12.88
+          DASHBOARD_URL: http://172.30.12.88
       - arm64-jerma:
-          branch: stable/jerma
           slave: lf-pod4
-          dashboard_url: http://172.30.12.83
-      - arm64-iruya:
-          branch: stable/iruya
-          slave: lf-virtual4
-          dashboard_url: http://172.30.13.89
-      - arm64-hunter:
-          branch: stable/hunter
-          slave: lf-virtual6
-          dashboard_url: http://172.30.13.91
+          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
@@ -113,19 +93,13 @@
           name: IMAGE_PROPERTIES
           default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
 
-- functest-pi-containers: &functest-pi-containers
-    name: 'functest-pi-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
-
 - functest-pi-run-containers: &functest-pi-run-containers
     name: 'functest-pi-run-containers'
     <<: *functest-pi-containers
     test: '{test}'
     privileged: '{privileged}'
     network: '{network}'
+    DASHBOARD_URL: '{DASHBOARD_URL}'
 
 - builder:
     name: functest-pi-pull-containers
@@ -169,6 +143,7 @@
             -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
             -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
             -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
+            -e DASHBOARD_URL={DASHBOARD_URL} \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             $image run_tests -t {test} -p -r
@@ -187,7 +162,6 @@
           fi
           sudo docker rmi $image || true
 
-
 - job-template:
     name: 'functest-pi-{repo}-{container}-{tag}-pull'
     parameters:
@@ -364,6 +338,10 @@
       - {'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'}
@@ -381,24 +359,14 @@
       - {'tag': 'jerma', 'test': 'patrole_member'}
       - {'tag': 'jerma', 'test': 'patrole_reader'}
       - {'tag': 'jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'iruya', 'test': 'patrole_admin'}
-      - {'tag': 'iruya', 'test': 'patrole_member'}
-      - {'tag': 'iruya', 'test': 'patrole_reader'}
-      - {'tag': 'iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'hunter', 'test': 'refstack_compute'}
-      - {'tag': 'hunter', 'test': 'refstack_object'}
-      - {'tag': 'hunter', 'test': 'refstack_platform'}
-      - {'tag': 'hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'hunter', 'test': 'patrole_admin'}
-      - {'tag': 'hunter', 'test': 'patrole_member'}
-      - {'tag': 'hunter', 'test': 'patrole_reader'}
-      - {'tag': 'hunter', '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'}
@@ -416,24 +384,14 @@
       - {'tag': 'arm-jerma', 'test': 'patrole_member'}
       - {'tag': 'arm-jerma', 'test': 'patrole_reader'}
       - {'tag': 'arm-jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm-iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_admin'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_member'}
-      - {'tag': 'arm-iruya', 'test': 'patrole_reader'}
-      - {'tag': 'arm-iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_compute'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_object'}
-      - {'tag': 'arm-hunter', 'test': 'refstack_platform'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'arm-hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_admin'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_member'}
-      - {'tag': 'arm-hunter', 'test': 'patrole_reader'}
-      - {'tag': 'arm-hunter', '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'}
@@ -451,20 +409,6 @@
       - {'tag': 'arm64-jerma', 'test': 'patrole_member'}
       - {'tag': 'arm64-jerma', 'test': 'patrole_reader'}
       - {'tag': 'arm64-jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm64-iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_member'}
-      - {'tag': 'arm64-iruya', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_compute'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_object'}
-      - {'tag': 'arm64-hunter', 'test': 'refstack_platform'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_admin'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_member'}
-      - {'tag': 'arm64-hunter', 'test': 'patrole_reader'}
-      - {'tag': 'arm64-hunter', 'test': 'tempest_cyborg'}
     jobs:
       - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
 
@@ -533,6 +477,7 @@
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -766,7 +711,7 @@
               <<: *functest-pi-jobs
 
 - project:
-    name: 'functest-pi'
+    name: 'functest-pi-daily'
     <<: *functest-pi-params
     jobs:
       - 'functest-pi-{tag}-daily'
@@ -781,4 +726,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: (?!functest-kubernetes)^functest-pi-[a-z-0-9]+-daily$
+    regex: ^functest-pi-[a-z-0-9.]+-daily$