From 590ae77b351cd1456bbc7405259f16a0f3e63fe3 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Wed, 9 Oct 2019 15:21:28 -0500
Subject: [PATCH] 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>
---
 modules/tox.ini                    | 2 +-
 playbooks/tox-puppet-lint/pre.yaml | 2 +-
 tox.ini                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/tox.ini b/modules/tox.ini
index 8ea7ccd06..a144cb159 100644
--- a/modules/tox.ini
+++ b/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}"
 
diff --git a/playbooks/tox-puppet-lint/pre.yaml b/playbooks/tox-puppet-lint/pre.yaml
index 1681dc7e9..016061efe 100644
--- a/playbooks/tox-puppet-lint/pre.yaml
+++ b/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
diff --git a/tox.ini b/tox.ini
index 0616439c3..6e79cfd1c 100644
--- a/tox.ini
+++ b/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}"