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: I0784643812f9947afba4e2e556aadae3296f7e36
This commit is contained in:
		
							
								
								
									
										3
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								Gemfile
									
									
									
									
									
								
							| @@ -3,7 +3,6 @@ source 'https://rubygems.org' | |||||||
| group :development, :test do | group :development, :test do | ||||||
|   gem 'puppetlabs_spec_helper', :require => false |   gem 'puppetlabs_spec_helper', :require => false | ||||||
|   gem 'rspec-puppet', '~> 2.1.0', :require => false |   gem 'rspec-puppet', '~> 2.1.0', :require => false | ||||||
|   gem 'minitest', '~> 4.7', :require => 'minitest/unit' |  | ||||||
|  |  | ||||||
|   gem 'metadata-json-lint' |   gem 'metadata-json-lint' | ||||||
|   gem 'puppet-lint-param-docs' |   gem 'puppet-lint-param-docs' | ||||||
| @@ -17,7 +16,7 @@ group :development, :test do | |||||||
|   gem 'puppet-lint-variable_contains_upcase' |   gem 'puppet-lint-variable_contains_upcase' | ||||||
|   gem 'puppet-lint-numericvariable' |   gem 'puppet-lint-numericvariable' | ||||||
|  |  | ||||||
|   gem 'beaker-rspec', '~> 2.2.4', :require => false |   gem 'beaker-rspec', :require => false | ||||||
|   gem 'json' |   gem 'json' | ||||||
|   gem 'webmock' |   gem 'webmock' | ||||||
| end | end | ||||||
|   | |||||||
| @@ -7,3 +7,4 @@ HOSTS: | |||||||
|     ip: 127.0.0.1 |     ip: 127.0.0.1 | ||||||
| CONFIG: | CONFIG: | ||||||
|   type: foss |   type: foss | ||||||
|  |   set_env: false | ||||||
|   | |||||||
| @@ -7,3 +7,4 @@ HOSTS: | |||||||
|     ip: 127.0.0.1 |     ip: 127.0.0.1 | ||||||
| CONFIG: | CONFIG: | ||||||
|   type: foss |   type: foss | ||||||
|  |   set_env: false | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Colleen Murphy
					Colleen Murphy