summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Zarzycki <azarzycki@mirantis.com>2016-07-06 17:56:55 +0200
committerArtur Zarzycki <azarzycki@mirantis.com>2016-07-06 17:57:44 +0200
commit43bbf2b9dca19059f4e41350b981027b2e1a4091 (patch)
treed99d0faf79795c784cbba7bde2b2045f052134c9
parent61749565b2c70003da8650bfc99d5392d76056e3 (diff)
Fix to pass linters tests
Notes
Notes (review): Code-Review+2: Eric Lemoine <elemoine@mirantis.com> Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Workflow+1: Proskurin Kirill <kproskurin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 06 Jul 2016 16:23:03 +0000 Reviewed-on: https://review.openstack.org/338370 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-rw-r--r--.gitreview4
-rwxr-xr-xtools/run-check-docker-syntax.sh10
-rwxr-xr-xtools/run-check-yaml-syntax.sh7
-rw-r--r--tox.ini15
4 files changed, 15 insertions, 21 deletions
diff --git a/.gitreview b/.gitreview
index becb36c..97889c0 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
1[gerrit] 1[gerrit]
2host=review.fuel-infra.org 2host=review.openstack.org
3port=29418 3port=29418
4project=nextgen/ms-rabbitmq.git 4project=openstack/fuel-ccp-rabbitmq.git
diff --git a/tools/run-check-docker-syntax.sh b/tools/run-check-docker-syntax.sh
deleted file mode 100755
index 82d609e..0000000
--- a/tools/run-check-docker-syntax.sh
+++ /dev/null
@@ -1,10 +0,0 @@
1#!/bin/bash
2
3### Temp docker syntax checker script. Doesnt really check something...
4set -e
5for file in $(find . -name 'Dockerfile.j2')
6do
7 fgrep -q FROM $file
8 fgrep -q MAINTAINER $file
9 fgrep -q RUN $file
10done
diff --git a/tools/run-check-yaml-syntax.sh b/tools/run-check-yaml-syntax.sh
new file mode 100755
index 0000000..e393c54
--- /dev/null
+++ b/tools/run-check-yaml-syntax.sh
@@ -0,0 +1,7 @@
1#!/bin/bash
2
3### Temp yaml syntax checker script.
4set -e
5for file in $(find . -name '*.yaml'); do
6 yamllint -d relaxed $file
7done
diff --git a/tox.ini b/tox.ini
index 4e6bef6..7efb0df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,14 @@
1[tox] 1[tox]
2minversion = 1.6 2minversion = 1.6
3envlist = py34,py27,pypy,pep8 3envlist = linters,bashate
4skipsdist = True 4skipsdist = True
5 5
6[testenv:linters] 6[testenv:linters]
7deps = yamllint
7commands = 8commands =
8 {toxinidir}/tools/run-check-docker-syntax.sh 9 {toxinidir}/tools/run-check-yaml-syntax.sh
9
10[testenv:pep8]
11commands =
12 {toxinidir}/tools/run-check-docker-syntax.sh
13 10
14[testenv:bashate] 11[testenv:bashate]
15commands = 12deps = bashate>=0.2
16 {toxinidir}/tools/run-check-docker-syntax.sh 13whitelist_externals = bash
17 14commands = bash -c "find {toxinidir} -type f -name '*.sh' -not -path '*/.tox/*' -print0 | xargs -0 bashate -v"