starlingx
/
stx-puppet
Code Issues Proposed changes

Fix puppet-lint errors 

Running tox locally or through zuul would fail with
puppet-lint warnings.

This was introduced by puppet-lint 2.4.0 and still exists
in 2.4.1

2.3.6 works as expected, so now we are clamping
to that version.

Change-Id: I19a1d4df2b299e4dcb581df43874d8e1866b3962
Closes-Bug: 1847534
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-10-09 15:21:28 -05:00
parent 56e73a28e4
commit 590ae77b35
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/tox.ini
View File

@ -29,6 +29,6 @@ setenv =
skip_tests = \ skip_tests = \
--no-documentation-check --no-documentation-check
commands = commands =
gem install --no-document json puppet-lint gem install --no-document json puppet-lint:2.3.6
bash -c "find {toxinidir} -name \*.pp -print0 | xargs -0 puppet-lint --fail-on-warnings {[testenv:puppetlint]skip_tests}" bash -c "find {toxinidir} -name \*.pp -print0 | xargs -0 puppet-lint --fail-on-warnings {[testenv:puppetlint]skip_tests}"

2
playbooks/tox-puppet-lint/pre.yaml
View File

@ -72,7 +72,7 @@
#$GEM_HOME/bin/bundle exec rake lint 2>&1 #$GEM_HOME/bin/bundle exec rake lint 2>&1
else else
gem install rake -n ./.bundled_gems/ gem install rake -n ./.bundled_gems/
gem install puppet-lint gem install puppet-lint:2.3.6
gem install puppetlabs_spec_helper gem install puppetlabs_spec_helper
# We'll run puppet-lint from tox # We'll run puppet-lint from tox
#./.bundled_gems/rake lint 2>&1 #./.bundled_gems/rake lint 2>&1

2
tox.ini
View File

@ -46,7 +46,7 @@ skip_tests = \
--no-autoloader_layout-check \ --no-autoloader_layout-check \
--no-documentation-check --no-documentation-check
commands = commands =
gem install --no-document json puppet-lint gem install --no-document json puppet-lint:2.3.6
bash -c "find {toxinidir}/puppet-manifests {toxinidir}/modules \ bash -c "find {toxinidir}/puppet-manifests {toxinidir}/modules \
-name \*.pp -print0 \ -name \*.pp -print0 \
| xargs -0 puppet-lint --fail-on-warnings {[testenv:linters]skip_tests}" | xargs -0 puppet-lint --fail-on-warnings {[testenv:linters]skip_tests}"