From: Colleen Murphy <colleen@gazlene.net>
Date: Mon, 8 Jun 2015 19:55:06 +0000 (-0700)
Subject: Unpin beaker-rspec
X-Git-Tag: 6.0.0~18^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ff9913826b6bf13dba755e578f647e1f76d7c703;p=puppet-modules%2Fpuppet-ceilometer.git

Unpin beaker-rspec

The latest version of beaker tries to manage sshd_config[1] in order to
pass through environment variables. JJB also tries to manage
sshd_config by adding Match blocks to securely allow root SSH[2]. When
beaker tries to append the PermitUserEnvironment line after the Match
blocks, SSH fails to open port 22 and beaker can't SSH in to the
node[3]. This patch unpins beaker-rspec and adds set_env: false to the
nodepool nodesets so that the set_env method is never called and does
not try to mess with the sshd_config.

[1] https://github.com/puppetlabs/beaker/blob/master/lib/beaker/host_prebuilt_steps.rb#L528
[2] http://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/puppet-module-jobs.yaml#n42
[3] http://logs.openstack.org/61/185161/1/check/gate-puppet-nova-puppet-beaker-rspec-dsvm-centos7/cd81608/console.html.gz#_2015-05-22_22_05_46_933
[4] https://github.com/puppetlabs/beaker/blob/master/lib/beaker/host_prebuilt_steps.rb#L502

Change-Id: Ia96c315a44d7ae90511d515b03166cbe5a060f31
---

diff --git a/Gemfile b/Gemfile
index 4c65317..3c0b875 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
   gem 'rspec-puppet', '~> 2.1.0', :require => false
-  gem 'minitest', '~> 4.7', :require => 'minitest/unit'
 
   gem 'metadata-json-lint'
   gem 'puppet-lint-param-docs'
@@ -17,7 +16,7 @@ group :development, :test do
   gem 'puppet-lint-variable_contains_upcase'
   gem 'puppet-lint-numericvariable'
 
-  gem 'beaker-rspec', '~> 2.2.4', :require => false
+  gem 'beaker-rspec', :require => false
   gem 'json'
   gem 'webmock'
 end
diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
index aed4f0b..575ae67 100644
--- a/spec/acceptance/nodesets/nodepool-centos7.yml
+++ b/spec/acceptance/nodesets/nodepool-centos7.yml
@@ -7,3 +7,4 @@ HOSTS:
     ip: 127.0.0.1
 CONFIG:
   type: foss
+  set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
index a2c1ecc..a95d9f3 100644
--- a/spec/acceptance/nodesets/nodepool-trusty.yml
+++ b/spec/acceptance/nodesets/nodepool-trusty.yml
@@ -7,3 +7,4 @@ HOSTS:
     ip: 127.0.0.1
 CONFIG:
   type: foss
+  set_env: false