Update Functest Gates according to XtestingCI

Change-Id: I8b4ced496b2995dc32b6f3867c300e725315a78c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 157 insertions, 78 deletions

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index a52f28fdb..3d18dee7b 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -80,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:
@@ -334,81 +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': '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'}
+      - 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'
 
@@ -541,12 +618,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