From 30453b16389c74ac927d69d349862f8d1aaaf08d Mon Sep 17 00:00:00 2001 From: Graham Whaley Date: Wed, 27 Feb 2019 19:09:14 +0000 Subject: [PATCH] yamllint: make files compliant To aid pre-checks before submission, lets make the files pass the default yamllint checks - then we can use yamllint to check new changes going forwards. Changes were: - change True to true for some bools (which also then matches the zuul gerrit driver docs) - add '---' document start lines - wrap one >80 char line using a '>' string construct Change-Id: I5c365517606b2c331e7155c56b9ebd7873244b10 Signed-off-by: Graham Whaley --- playbooks/github-wip/run.yaml | 1 + roles/check-github-pr-is-wip/tasks/main.yaml | 1 + zuul.d/jobs.yaml | 4 +++- zuul.d/pipelines.yaml | 11 ++++++----- zuul.d/project-templates.yaml | 1 + zuul.d/projects.yaml | 1 + 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/playbooks/github-wip/run.yaml b/playbooks/github-wip/run.yaml index 81d9056..7f39570 100644 --- a/playbooks/github-wip/run.yaml +++ b/playbooks/github-wip/run.yaml @@ -1,3 +1,4 @@ +--- - hosts: localhost roles: - role: check-github-pr-is-wip diff --git a/roles/check-github-pr-is-wip/tasks/main.yaml b/roles/check-github-pr-is-wip/tasks/main.yaml index 907433c..64f75d4 100644 --- a/roles/check-github-pr-is-wip/tasks/main.yaml +++ b/roles/check-github-pr-is-wip/tasks/main.yaml @@ -1,2 +1,3 @@ +--- - name: Check for WIP labels or WIP title keywords on a GitHub PR script: github_wip.py {{ github_pr }} '{{ wip_keywords }}' '{{ wip_labels }}' diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5c8dac5..879a873 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,3 +1,4 @@ +--- # Shared zuul config specific to Kata Containers Zuul tenant # Contains definitions of trusted jobs @@ -13,7 +14,8 @@ vars: tox_envlist: linters tox_environment: - ANSIBLE_ROLES_PATH: ~/src/git.openstack.org/openstack-infra/zuul-jobs/roles:~/src/git.openstack.org/kata-containers/zuul-config/roles + ANSIBLE_ROLES_PATH: > + ~/src/git.openstack.org/openstack-infra/zuul-jobs/roles:~/src/git.openstack.org/kata-containers/zuul-config/roles - job: name: kata-github-wip diff --git a/zuul.d/pipelines.yaml b/zuul.d/pipelines.yaml index 29818c0..389a5b0 100644 --- a/zuul.d/pipelines.yaml +++ b/zuul.d/pipelines.yaml @@ -1,3 +1,4 @@ +--- # Shared zuul config specific to the Kata Containers Zuul tenant # Contains definitions of pipelines @@ -14,8 +15,8 @@ precedence: low require: gerrit: - open: True - current-patchset: True + open: true + current-patchset: true trigger: gerrit: - event: patchset-created @@ -43,11 +44,11 @@ http://docs.openstack.org/infra/manual/developers.html#automated-testing manager: dependent precedence: normal - post-review: True + post-review: true require: gerrit: - open: True - current-patchset: True + open: true + current-patchset: true trigger: gerrit: - event: comment-added diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 0f814ee..d8905f6 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -1,3 +1,4 @@ +--- - project-template: name: kata-pre-checks description: | diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index e6f86bb..5b63f6f 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -1,3 +1,4 @@ +--- # Shared zuul config specific to the Kata Containers Zuul tenant # Contains job pipeline definitions for each project