From e2991f52a50ea40abb8e7473b0cc41734c01efbe Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 15 Dec 2015 08:06:52 -0500 Subject: [PATCH] puppet: unpin bundler for unit & syntax jobs Bundler 1.11.1 [1] has been released so we don't need to pin our CI, since this release includes the Psych fix [2]. [1] https://github.com/bundler/bundler/releases/tag/v1.11.1 [2] https://github.com/bundler/bundler/commit/4c8a0f479ee9da79019907de43f7414bf820b250 Change-Id: Ib04bcd68954cff830992a099d90030d7b8207978 --- jenkins/jobs/puppet-module-jobs.yaml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml index ccf110b2b9..4894946833 100644 --- a/jenkins/jobs/puppet-module-jobs.yaml +++ b/jenkins/jobs/puppet-module-jobs.yaml @@ -14,10 +14,7 @@ fi mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems - # We need to pin bundler to the previous release because of: - # https://github.com/bundler/bundler/issues/4149 - # This workaround can be dropped once 1.12.0 is released. - gem install bundler --no-rdoc --no-ri --verbose -v 1.10.6 + gem install bundler --no-rdoc --no-ri --verbose $GEM_HOME/bin/bundle install $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation' @@ -50,10 +47,7 @@ rm -f Gemfile.lock mkdir .bundled_gems_$PUPPET_VERSION export GEM_HOME=`pwd`/.bundled_gems_$PUPPET_VERSION - # We need to pin bundler to the previous release because of: - # https://github.com/bundler/bundler/issues/4149 - # This workaround can be dropped once 1.12.0 is released. - gem install bundler --no-rdoc --no-ri --verbose -v 1.10.6 + gem install bundler --no-rdoc --no-ri --verbose $GEM_HOME/bin/bundle install set +e $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation' @@ -172,10 +166,7 @@ export PUPPET_GEM_VERSION='~> {puppet_version}' mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems - # We need to pin bundler to the previous release because of: - # https://github.com/bundler/bundler/issues/4149 - # This workaround can be dropped once 1.12.0 is released. - gem install bundler --no-rdoc --no-ri --verbose -v 1.10.6 + gem install bundler --no-rdoc --no-ri --verbose $GEM_HOME/bin/bundle install # FUTURE_PARSER=yes is only supported by Puppet 3.x if [ "{puppet_version}" -lt "4" ]; then