openstack
/
project-config
Code Issues Proposed changes

Detect misaligned ':' in zuul/layout.yaml 

This came up in I79ced2532d03701f50afc9d2a6e4a6e533e8228a.  I don't
think it's actually a problem as the value is stripped.  Certainly the
zuul config-parser doesn't trip up on it.  So it's just for
consistency.

This found the entries fixed up in in zuul/layout.yaml

Change-Id: I76abb096426e24683fe8316c2f8e2d7a796dd96e
This commit is contained in:
Ian Wienand 2017-02-28 10:25:43 +11:00
parent b0592327b7
commit 1418d48f82
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/layout-checks.py
View File

@ -96,6 +96,15 @@ def check_formatting():
print("Line %(count)s not indented by multiple of 2:\n\t%(line)s" %
{"count": count, "line": line})
errors = True
# check for something like
# - name : ...
# which for consistency we like called "name: ..."
if " : " in line:
print("Line %(count)s does not align key with ':'\n\t%(line)s" %
{"count": count, "line": line})
errors = True
count = count + 1
return errors

14
zuul/layout.yaml
View File

@ -1684,7 +1684,7 @@ jobs:
branch: ^(?!stable/(hammer|liberty|mitaka|newton)).*$
# tripleo multinode jobs run in Puppet CI are only supported from Ocata.
- name : ^gate-tripleo-ci-centos-7-scenario.*-multinode-puppet.*$
- name: ^gate-tripleo-ci-centos-7-scenario.*-multinode-puppet.*$
branch: ^(?!stable/(hammer|liberty|mitaka|newton)).*$
skip-if:
- project: ^openstack/puppet-.*$
@ -1699,14 +1699,14 @@ jobs:
branch: ^(?!stable/(hammer|liberty|mitaka|newton)).*$
# TripleO Upgrade job has been introduced in Ocata
- name : ^gate-tripleo-ci-centos-7.*-upgrades.*$
- name: ^gate-tripleo-ci-centos-7.*-upgrades.*$
branch: ^(?!stable/(hammer|liberty|mitaka|newton)).*$
# NOTE(emilien): zuul v2 does not allow us to specify files rules for specific projects
# and are global to the jobname.
# It will be done with zuul v3:
# http://specs.openstack.org/openstack-infra/infra-specs/specs/zuulv3.html#jobs
- name : ^gate-tripleo-ci-centos-7-scenario001-multinode.*$
- name: ^gate-tripleo-ci-centos-7-scenario001-multinode.*$
branch: ^(?!stable/(hammer|liberty|mitaka)).*$
files:
- ^puppet/services/aodh.*$
@ -1731,7 +1731,7 @@ jobs:
- ^manifests/profile/base/congress.*$
- ci/environments/scenario001-multinode.yaml
- ci/pingtests/scenario001-multinode.yaml
- name : ^gate-tripleo-ci-centos-7-scenario002-multinode.*$
- name: ^gate-tripleo-ci-centos-7-scenario002-multinode.*$
branch: ^(?!stable/(hammer|liberty|mitaka)).*$
files:
- ^puppet/services/barbican.*$
@ -1746,7 +1746,7 @@ jobs:
- ^manifests/profile/base/zaqar.*$
- ci/environments/scenario002-multinode.yaml
- ci/pingtests/scenario002-multinode.yaml
- name : ^gate-tripleo-ci-centos-7-scenario003-multinode.*$
- name: ^gate-tripleo-ci-centos-7-scenario003-multinode.*$
branch: ^(?!stable/(hammer|liberty|mitaka)).*$
files:
- ^puppet/services/sahara.*$
@ -1755,7 +1755,7 @@ jobs:
- ^manifests/profile/base/mistral.*$
- ci/environments/scenario003-multinode.yaml
- ci/pingtests/scenario003-multinode.yaml
- name : ^gate-tripleo-ci-centos-7-scenario004-multinode.*$
- name: ^gate-tripleo-ci-centos-7-scenario004-multinode.*$
branch: ^(?!stable/(hammer|liberty|mitaka|newton)).*$
files:
- ^puppet/services/ceph.*$
@ -1765,7 +1765,7 @@ jobs:
- ^manifests/profile/pacemaker/manila.*$
- ci/environments/scenario004-multinode.yaml
- ci/pingtests/scenario004-multinode.yaml
- name : ^gate-tripleo-ci-centos-7-scenario005-multinode.*$
- name: ^gate-tripleo-ci-centos-7-scenario005-multinode.*$
branch: ^(?!stable/(hammer|liberty|mitaka|newton)).*$
files:
- ^puppet/services/pacemaker.*$