Skip to content

Commit ff99138

Browse files
committed
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
1 parent 264ea1b commit ff99138

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
33
group :development, :test do
44
gem 'puppetlabs_spec_helper', :require => false
55
gem 'rspec-puppet', '~> 2.1.0', :require => false
6-
gem 'minitest', '~> 4.7', :require => 'minitest/unit'
76

87
gem 'metadata-json-lint'
98
gem 'puppet-lint-param-docs'
@@ -17,7 +16,7 @@ group :development, :test do
1716
gem 'puppet-lint-variable_contains_upcase'
1817
gem 'puppet-lint-numericvariable'
1918

20-
gem 'beaker-rspec', '~> 2.2.4', :require => false
19+
gem 'beaker-rspec', :require => false
2120
gem 'json'
2221
gem 'webmock'
2322
end

spec/acceptance/nodesets/nodepool-centos7.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ HOSTS:
77
ip: 127.0.0.1
88
CONFIG:
99
type: foss
10+
set_env: false

spec/acceptance/nodesets/nodepool-trusty.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ HOSTS:
77
ip: 127.0.0.1
88
CONFIG:
99
type: foss
10+
set_env: false

0 commit comments

Comments
 (0)