From: Cédric Ollivier Date: Tue, 22 Jun 2021 08:09:19 +0000 (+0200) Subject: Update Functest Gates according to XtestingCI X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7a5d6483138a1f6e5bb183d68689b42aa74209ba;p=releng.git Update Functest Gates according to XtestingCI Change-Id: I8b4ced496b2995dc32b6f3867c300e725315a78c Signed-off-by: Cédric Ollivier --- diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml index ae84749ca..b735e8b64 100644 --- a/jjb/functest/functest-kubernetes-ng.yaml +++ b/jjb/functest/functest-kubernetes-ng.yaml @@ -41,7 +41,6 @@ name: slave default: '{slave}' - - functest-kubernetes-ng-build-containers: &functest-kubernetes-ng-build-containers name: 'functest-kubernetes-ng-build-containers' <<: *functest-kubernetes-ng-containers @@ -151,7 +150,6 @@ jobs: - 'functest-kubernetes-ng-{repo}-{tag}-dep-rmi' - - builder: name: functest-kubernetes-ng-push-containers builders: @@ -243,7 +241,6 @@ jobs: - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build' - - job-template: name: 'functest-kubernetes-ng-{tag}-docker' project-type: multijob @@ -255,12 +252,14 @@ parameters: - functest-kubernetes-ng-slave: slave: '{slave}' + # 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-kubernetes-ng-{tag}-(daily|docker|review)$' + - ^functest-kubernetes-ng-{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove dependency diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml index 6c7803b89..913036e6e 100644 --- a/jjb/functest/functest-kubernetes-pi.yaml +++ b/jjb/functest/functest-kubernetes-pi.yaml @@ -274,13 +274,20 @@ privileged: 'false' network: bridge exclude: - - {'tag': 'latest', 'test': 'k8s_io'} - - {'tag': 'v1.21', 'test': 'k8s_io'} - - {'tag': 'jerma', 'test': 'k8s_io'} - - {'tag': 'arm-latest', 'test': 'k8s_io'} - - {'tag': 'arm-v1.21', 'test': 'k8s_io'} - - {'tag': 'arm64-latest', 'test': 'k8s_io'} - - {'tag': 'arm64-v1.21', 'test': 'k8s_io'} + - tag: latest + test: k8s_io + - tag: v1.21 + test: k8s_io + - tag: jerma + test: k8s_io + - tag: arm-latest + test: k8s_io + - tag: arm-v1.21 + test: k8s_io + - tag: arm64-latest + test: k8s_io + - tag: arm64-v1.21 + test: k8s_io jobs: - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run' @@ -386,12 +393,14 @@ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha - functest-kubernetes-pi-E2E_TEST_OPTS: E2E_TEST_OPTS: container-runtime:containerd + # 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-kubernetes-pi-{tag}-(daily|docker|review)$' + - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 6abfaa337..6b8547927 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -274,8 +274,10 @@ privileged: 'false' network: bridge exclude: - - {'tag': 'latest', 'test': 'k8s_io'} - - {'tag': 'v1.21', 'test': 'k8s_io'} + - tag: latest + test: k8s_io + - tag: v1.21 + test: k8s_io jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' @@ -381,12 +383,14 @@ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha - functest-kubernetes-E2E_TEST_OPTS: E2E_TEST_OPTS: container-runtime:containerd + # 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-kubernetes-{tag}-(daily|docker|review)$' + - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -725,7 +729,6 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-gate' - - trigger: name: functest-kubernetes-patchset-created triggers: @@ -758,12 +761,14 @@ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha - functest-kubernetes-E2E_TEST_OPTS: E2E_TEST_OPTS: container-runtime:containerd + # 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-kubernetes-{tag}-(daily|docker|review)$' + - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -1008,7 +1013,6 @@ jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-build' - - job-template: name: 'functest-kubernetes-{tag}-docker' project-type: multijob @@ -1020,12 +1024,14 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + # 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-kubernetes-{tag}-(daily|docker|review)$' + - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove dependency 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 diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 2ae099529..38beebe88 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -70,12 +70,14 @@ - string: name: EXTERNAL_NETWORK default: public + - parameter: name: functest-VOLUME_DEVICE_NAME parameters: - string: name: VOLUME_DEVICE_NAME default: sdb + - parameter: name: functest-IMAGE_PROPERTIES parameters: @@ -324,31 +326,56 @@ 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: 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 jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -481,12 +508,14 @@ VOLUME_DEVICE_NAME: sdb - functest-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-{tag}-(daily|docker|review)$' + - ^functest-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -905,7 +934,6 @@ jobs: - 'functest-{repo}-{container}-{tag}-gate' - - trigger: name: functest-patchset-created triggers: @@ -940,12 +968,14 @@ VOLUME_DEVICE_NAME: sdb - functest-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-{tag}-(daily|docker|review)$' + - ^functest-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -1272,7 +1302,6 @@ jobs: - 'functest-{repo}-{container}-{tag}-build' - - job-template: name: 'functest-{tag}-docker' project-type: multijob @@ -1284,12 +1313,14 @@ parameters: - functest-slave: slave: '{slave}' + # 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-{tag}-(daily|docker|review)$' + - ^functest-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove dependency diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml index 88ba74849..fdcdae52c 100644 --- a/jjb/functest/xtesting-pi.yaml +++ b/jjb/functest/xtesting-pi.yaml @@ -59,7 +59,6 @@ - random-string: name: build_tag - - xtesting-pi-run-containers: &xtesting-pi-run-containers name: 'xtesting-pi-run-containers' <<: *xtesting-pi-containers @@ -194,15 +193,24 @@ privileged: 'false' network: bridge exclude: - - {'tag': 'leguer', 'test': 'eighth'} - - {'tag': 'kali', 'test': 'eighth'} - - {'tag': 'jerma', 'test': 'eighth'} - - {'tag': 'arm-leguer', 'test': 'eighth'} - - {'tag': 'arm-kali', 'test': 'eighth'} - - {'tag': 'arm-jerma', 'test': 'eighth'} - - {'tag': 'arm64-leguer', 'test': 'eighth'} - - {'tag': 'arm64-kali', 'test': 'eighth'} - - {'tag': 'arm64-jerma', 'test': 'eighth'} + - tag: leguer + test: eighth + - tag: kali + test: eighth + - tag: jerma + test: eighth + - tag: arm-leguer + test: eighth + - tag: arm-kali + test: eighth + - tag: arm-jerma + test: eighth + - tag: arm64-leguer + test: eighth + - tag: arm64-kali + test: eighth + - tag: arm64-jerma + test: eighth jobs: - 'xtesting-pi-{repo}-{container}-{tag}-{test}-run' @@ -270,12 +278,14 @@ slave: '{slave}' - xtesting-pi-build_tag: build_tag: '' + # 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: - - '^xtesting-pi-{tag}-(daily|docker|review)$' + - ^xtesting-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 1239ad0be..254ef7084 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -59,7 +59,6 @@ - random-string: name: build_tag - - xtesting-run-containers: &xtesting-run-containers name: 'xtesting-run-containers' <<: *xtesting-containers @@ -194,9 +193,12 @@ privileged: 'false' network: bridge exclude: - - {'tag': 'leguer', 'test': 'eighth'} - - {'tag': 'kali', 'test': 'eighth'} - - {'tag': 'jerma', 'test': 'eighth'} + - tag: leguer + test: eighth + - tag: kali + test: eighth + - tag: jerma + test: eighth jobs: - 'xtesting-{repo}-{container}-{tag}-{test}-run' @@ -264,12 +266,14 @@ slave: '{slave}' - xtesting-build_tag: build_tag: '' + # 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: - - '^xtesting-{tag}-(daily|docker|review)$' + - ^xtesting-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -508,7 +512,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-gate' - - trigger: name: xtesting-patchset-created triggers: @@ -537,12 +540,14 @@ slave: '{slave}' - xtesting-build_tag: build_tag: '' + # 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: - - '^xtesting-{tag}-(daily|docker|review)$' + - ^xtesting-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove former images @@ -679,7 +684,6 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-build' - - job-template: name: 'xtesting-{tag}-docker' project-type: multijob @@ -691,12 +695,14 @@ parameters: - xtesting-slave: slave: '{slave}' + # 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: - - '^xtesting-{tag}-(daily|docker|review)$' + - ^xtesting-(pi-)*{tag}-(daily|docker|review)$ + # yamllint enable rule:indentation builders: - multijob: name: remove dependency