From 0e242cdf50942e07a3365c565c04a305c6ab12e2 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Thu, 3 Jan 2019 20:49:24 +0100 Subject: [PATCH] Pin bundler in puppet-lint and -syntax jobs Fix the puppet-lint and puppet-syntax jobs for the same reasons as in 656a86b2. Change-Id: I0767b9379a63732c2001b01b528cbc770c68ef06 --- playbooks/legacy/puppet-lint/run.yaml | 2 +- playbooks/legacy/puppet-syntax-3/run.yaml | 2 +- playbooks/legacy/puppet-syntax-4-centos-7/run.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/legacy/puppet-lint/run.yaml b/playbooks/legacy/puppet-lint/run.yaml index 5f073803..3323e0b3 100644 --- a/playbooks/legacy/puppet-lint/run.yaml +++ b/playbooks/legacy/puppet-lint/run.yaml @@ -87,7 +87,7 @@ mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems if [ -f Gemfile ]; then - gem install bundler --no-rdoc --no-ri --verbose + gem install bundler --no-rdoc --no-ri --verbose --version '<2.0.0' $GEM_HOME/bin/bundle install --without system_tests $GEM_HOME/bin/bundle exec rake lint 2>&1 else diff --git a/playbooks/legacy/puppet-syntax-3/run.yaml b/playbooks/legacy/puppet-syntax-3/run.yaml index b459045a..98b3036a 100644 --- a/playbooks/legacy/puppet-syntax-3/run.yaml +++ b/playbooks/legacy/puppet-syntax-3/run.yaml @@ -73,7 +73,7 @@ export PUPPET_GEM_VERSION='~> 3' mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose + gem install bundler --no-rdoc --no-ri --verbose --version '<2.0.0' $GEM_HOME/bin/bundle install --retry 3 # FUTURE_PARSER=yes is only supported by Puppet 3.x if [ "3" -lt "4" ]; then diff --git a/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml b/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml index f510d370..3cfe619e 100644 --- a/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml +++ b/playbooks/legacy/puppet-syntax-4-centos-7/run.yaml @@ -73,7 +73,7 @@ export PUPPET_GEM_VERSION='~> 4' mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems - gem install bundler --no-rdoc --no-ri --verbose + gem install bundler --no-rdoc --no-ri --verbose --version '<2.0.0' $GEM_HOME/bin/bundle install --retry 3 # FUTURE_PARSER=yes is only supported by Puppet 3.x if [ "4" -lt "4" ]; then