Browse Source

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>
changes/71/687671/1
Al Bailey 2 years ago
parent
commit
590ae77b35
  1. 2
      modules/tox.ini
  2. 2
      playbooks/tox-puppet-lint/pre.yaml
  3. 2
      tox.ini

2
modules/tox.ini

@ -29,6 +29,6 @@ setenv =
skip_tests = \
--no-documentation-check
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}"

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

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

2
tox.ini

@ -46,7 +46,7 @@ skip_tests = \
--no-autoloader_layout-check \
--no-documentation-check
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 \
-name \*.pp -print0 \
| xargs -0 puppet-lint --fail-on-warnings {[testenv:linters]skip_tests}"

Loading…
Cancel
Save