Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove useless blank lines
[releng.git] / jjb / functest / functest-pi.yaml
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 5409d2d..27b4672 100644 (file)
--- 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
@@ -100,12 +80,14 @@
       - string:
           name: EXTERNAL_NETWORK
           default: public
+
 - parameter:
     name: functest-pi-VOLUME_DEVICE_NAME
     parameters:
       - string:
           name: VOLUME_DEVICE_NAME
           default: sdb
+
 - parameter:
     name: functest-pi-IMAGE_PROPERTIES
     parameters:
@@ -113,19 +95,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 +145,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 +164,6 @@
           fi
           sudo docker rmi $image || true
 
-
 - job-template:
     name: 'functest-pi-{repo}-{container}-{tag}-pull'
     parameters:
@@ -360,111 +336,156 @@
     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': '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': '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-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': '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-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'}
-      - {'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'}
+      - 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
     jobs:
       - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
 
@@ -527,12 +548,12 @@
     jobs:
       - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
 
-
 - builder:
     name: functest-pi-zip
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -596,12 +617,14 @@
           VOLUME_DEVICE_NAME: sdb
       - functest-pi-IMAGE_PROPERTIES:
           IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-pi-{tag}-(daily|docker|review)$'
+          - ^functest-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -781,4 +804,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-pi-[a-z0-9]+-daily$
+    regex: ^functest-pi-[a-z-0-9.]+-daily$