From 548ad8ff8701cfec448c618b5ed8c798666053e2 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 16 Sep 2016 19:45:55 -0700 Subject: [PATCH] Yaml linter execution and config improved Change-Id: I29c124f9c84f6d5c7efc77edc7c7a85e75392b15 --- jenkins-tp/jobs/fuel-ccp-docs-build-jobs.yaml | 9 ++++--- jenkins-tp/jobs/fuel-ccp-gate-jobs.yaml | 24 +++++++++---------- jenkins-tp/jobs/fuel-ccp-post-jobs.yaml | 1 - jenkins-tp/jobs/macros.yaml | 20 +++++++--------- jenkins-tp/jobs/mcp-build-images.yaml | 6 ++--- jenkins-tp/jobs/verify-ci.yaml | 8 +++---- tools/run-check-yaml-syntax.sh | 7 ------ tools/yamllint.sh | 5 ++++ tools/yamllint.yaml | 21 ++++++++++++++++ tox.ini | 4 +++- zuul-tp/layout.yaml | 1 - 11 files changed, 61 insertions(+), 45 deletions(-) delete mode 100755 tools/run-check-yaml-syntax.sh create mode 100755 tools/yamllint.sh create mode 100644 tools/yamllint.yaml diff --git a/jenkins-tp/jobs/fuel-ccp-docs-build-jobs.yaml b/jenkins-tp/jobs/fuel-ccp-docs-build-jobs.yaml index 404dd29..8d5f72f 100644 --- a/jenkins-tp/jobs/fuel-ccp-docs-build-jobs.yaml +++ b/jenkins-tp/jobs/fuel-ccp-docs-build-jobs.yaml @@ -40,12 +40,11 @@ triggers: - zuul - - project: name: fuel-ccp-docs-build-jobs jobs: - - 'build-all-docs-manual-job-{repo}' - - 'build-all-docs-triggered-job-{repo}' + - 'build-all-docs-manual-job-{repo}' + - 'build-all-docs-triggered-job-{repo}' repo: - - 'fuel-ccp-specs': - branch: 'master' + - 'fuel-ccp-specs': + branch: 'master' diff --git a/jenkins-tp/jobs/fuel-ccp-gate-jobs.yaml b/jenkins-tp/jobs/fuel-ccp-gate-jobs.yaml index 3aae476..8b92dde 100644 --- a/jenkins-tp/jobs/fuel-ccp-gate-jobs.yaml +++ b/jenkins-tp/jobs/fuel-ccp-gate-jobs.yaml @@ -45,22 +45,22 @@ artifacts: '*' latest-only: false - post-tasks: - - matches: - - log-text: '' - escalate-status: true - run-if-job-successful: false - script: | - #!/bin/bash + - matches: + - log-text: '' + escalate-status: true + run-if-job-successful: false + script: | + #!/bin/bash - set -ex + set -ex - export ENV_NAME="env-k8s-kargo-$BUILD_TAG" + export ENV_NAME="env-k8s-kargo-$BUILD_TAG" - source /home/jenkins/venv-fuel-devops-3.0/bin/activate - echo "Running on $NODE_NAME: $ENV_NAME" + source /home/jenkins/venv-fuel-devops-3.0/bin/activate + echo "Running on $NODE_NAME: $ENV_NAME" - dos.py erase $ENV_NAME || true - deactivate + dos.py erase $ENV_NAME || true + deactivate - job: name: fuel-ccp-mcp-qa diff --git a/jenkins-tp/jobs/fuel-ccp-post-jobs.yaml b/jenkins-tp/jobs/fuel-ccp-post-jobs.yaml index f7c4c09..de57fe1 100644 --- a/jenkins-tp/jobs/fuel-ccp-post-jobs.yaml +++ b/jenkins-tp/jobs/fuel-ccp-post-jobs.yaml @@ -12,4 +12,3 @@ global: true triggers: - zuul - diff --git a/jenkins-tp/jobs/macros.yaml b/jenkins-tp/jobs/macros.yaml index 04c495b..2078c7a 100644 --- a/jenkins-tp/jobs/macros.yaml +++ b/jenkins-tp/jobs/macros.yaml @@ -5,19 +5,19 @@ name: mcpinstaller scm: - git: - url: 'ssh://nextgen-ci@review.fuel-infra.org:29418/{scm-repo}' - branches: - - '{scm-branch}' - basedir: '{scm-basedir}' + url: 'ssh://nextgen-ci@review.fuel-infra.org:29418/{scm-repo}' + branches: + - '{scm-branch}' + basedir: '{scm-basedir}' - scm: name: openstack scm: - git: - url: 'https://git.openstack.org/openstack/{scm-repo}.git' - branches: - - '{scm-branch}' - basedir: '{scm-basedir}' + url: 'https://git.openstack.org/openstack/{scm-repo}.git' + branches: + - '{scm-branch}' + basedir: '{scm-basedir}' - scm: name: fuel-infra @@ -29,7 +29,6 @@ branches: - '{scm-branch}' - - scm: name: zuul_repo scm: @@ -56,7 +55,6 @@ # Static repositories # - # # SSH credentials # @@ -82,7 +80,7 @@ # # Publishers # -#TODO: check target fuel-ccp-ci +# TODO: check target fuel-ccp-ci - publisher: name: logs-public publishers: diff --git a/jenkins-tp/jobs/mcp-build-images.yaml b/jenkins-tp/jobs/mcp-build-images.yaml index d04e2be..a044965 100644 --- a/jenkins-tp/jobs/mcp-build-images.yaml +++ b/jenkins-tp/jobs/mcp-build-images.yaml @@ -63,6 +63,6 @@ - project: name: Build MCP Docker images and store them into Docker registry. jobs: - - 'mcp-build-images-latest' - - 'mcp-build-images-build-number' - - 'mcp-clean-docker-registry' + - 'mcp-build-images-latest' + - 'mcp-build-images-build-number' + - 'mcp-clean-docker-registry' diff --git a/jenkins-tp/jobs/verify-ci.yaml b/jenkins-tp/jobs/verify-ci.yaml index dac3e5d..ff35739 100644 --- a/jenkins-tp/jobs/verify-ci.yaml +++ b/jenkins-tp/jobs/verify-ci.yaml @@ -33,13 +33,13 @@ - project: name: verify-ci-bashate jobs: - - 'verify-bashate-{repo}' + - 'verify-bashate-{repo}' repo: - - 'project-config' + - 'project-config' - project: name: verify-ci-jjb jobs: - - 'verify-jjb-{repo}' + - 'verify-jjb-{repo}' repo: - - 'project-config' + - 'project-config' diff --git a/tools/run-check-yaml-syntax.sh b/tools/run-check-yaml-syntax.sh deleted file mode 100755 index e393c54..0000000 --- a/tools/run-check-yaml-syntax.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -### Temp yaml syntax checker script. -set -e -for file in $(find . -name '*.yaml'); do - yamllint -d relaxed $file -done diff --git a/tools/yamllint.sh b/tools/yamllint.sh new file mode 100755 index 0000000..6e84445 --- /dev/null +++ b/tools/yamllint.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -ex + +workdir=$(dirname $0) +yamllint -c $workdir/yamllint.yaml $(find . -not -path '*/\.*' -type f -name '*.yaml') diff --git a/tools/yamllint.yaml b/tools/yamllint.yaml new file mode 100644 index 0000000..6c2e4a7 --- /dev/null +++ b/tools/yamllint.yaml @@ -0,0 +1,21 @@ +extends: default + +rules: + braces: + max-spaces-inside: 1 + comments: + level: error + comments-indentation: + level: warning + document-end: + present: no + document-start: + level: error + present: no + empty-lines: + max: 1 + max-start: 0 + max-end: 0 + line-length: + level: warning + max: 120 diff --git a/tox.ini b/tox.ini index ef3ff5b..4380e53 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,10 @@ deps = usedevelop = False [testenv:linters] +whitelist_externals = + bash commands = - {toxinidir}/tools/run-check-yaml-syntax.sh + {toxinidir}/tools/yamllint.sh # bashate check bash -c "find {toxinidir} -type f -name '*.sh' -not -path '*/.tox/*' -print0 | xargs -0 bashate -v -iE006" diff --git a/zuul-tp/layout.yaml b/zuul-tp/layout.yaml index 180aaa4..b6d4bbd 100644 --- a/zuul-tp/layout.yaml +++ b/zuul-tp/layout.yaml @@ -161,4 +161,3 @@ projects: periodic: - 'mcp-build-images-build-number' - 'mcp-clean-docker-registry' -