beaker 4.6.0 → 4.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -0
- data/CHANGELOG.md +14 -1
- data/acceptance/pre_suite/subcommands/05_install_ruby.rb +12 -7
- data/acceptance/pre_suite/subcommands/08_install_beaker.rb +1 -1
- data/beaker.gemspec +2 -2
- data/lib/beaker/host/cisco.rb +13 -0
- data/lib/beaker/host_prebuilt_steps.rb +1 -1
- data/lib/beaker/version.rb +1 -1
- data/spec/beaker/host/cisco_spec.rb +8 -2
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 49a51b9e8d62155af1c109fe8edca707595c46ca
|
4
|
+
data.tar.gz: 20ebdd88c744771efa47cf79811fbfb0db2dddd3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2a0338731f2679539e2acfd39397fafb9dd658d6cb9f3c97f148e58f0f8d4380878349693926ba82096322ae19f1c3bcd4c36a9bcf6c577039f80d79b26f2c99
|
7
|
+
data.tar.gz: a080d53d6936470b925a16e13e6f851871f6e02187d5006c3ff799e487a93befb57a0302d8c905c1cd341142178162a1bf1e46512c723d03256d07fe3410e1ac
|
data/.travis.yml
CHANGED
data/CHANGELOG.md
CHANGED
@@ -11,7 +11,20 @@ Tracking in this Changelog began for this project in version 3.25.0.
|
|
11
11
|
If you're looking for changes from before this, refer to the project's
|
12
12
|
git logs & PR history.
|
13
13
|
|
14
|
-
# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.
|
14
|
+
# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.7.0...master)
|
15
|
+
|
16
|
+
# [4.7.0](https://github.com/puppetlabs/beaker/compare/4.6.0...4.7.0) - 2019-04-17
|
17
|
+
|
18
|
+
### Added
|
19
|
+
|
20
|
+
- Provide for OpenSSL 1.1.x+ support
|
21
|
+
- enable Solaris10Sparc pkgutil SSL CA2 (IMAGES-844)
|
22
|
+
|
23
|
+
### Changed
|
24
|
+
- update pry-byebug dependency 3.4.2->3.6 (BKR-1568)
|
25
|
+
- disabling hostkey checks for cisco hosts (QENG-7108)
|
26
|
+
- Change behavior of ruby versioning to accept job-parameter RUBY\_VER
|
27
|
+
- Change subcommand pre-suite to install ruby 2.3.1
|
15
28
|
|
16
29
|
# [4.6.0](https://github.com/puppetlabs/beaker/compare/4.5.0...4.6.0) - 2019.03.07
|
17
30
|
|
@@ -1,4 +1,9 @@
|
|
1
|
-
|
1
|
+
ruby_version, ruby_source = ENV['RUBY_VER'], "job parameter"
|
2
|
+
unless ruby_version
|
3
|
+
ruby_version = "2.3.1"
|
4
|
+
ruby_source = "default"
|
5
|
+
end
|
6
|
+
test_name "Install and configure Ruby #{ruby_version} (from #{ruby_source}) on the SUT" do
|
2
7
|
|
3
8
|
step 'Ensure that the default system is an el-based system' do
|
4
9
|
# The pre-suite currently only supports el systems, and we should
|
@@ -18,12 +23,12 @@ test_name 'Install and configure Ruby 2.2.5 on the SUT' do
|
|
18
23
|
on default, 'yum install wget -y'
|
19
24
|
end
|
20
25
|
|
21
|
-
step
|
22
|
-
on default,
|
23
|
-
on default,
|
24
|
-
on default,
|
25
|
-
on default,
|
26
|
-
on default,
|
26
|
+
step "download and install ruby #{ruby_version}" do
|
27
|
+
on default, "wget http://cache.ruby-lang.org/pub/ruby/#{ruby_version[0..2]}/ruby-#{ruby_version}.tar.gz"
|
28
|
+
on default, "tar xvfz ruby-#{ruby_version}.tar.gz"
|
29
|
+
on default, "cd ruby-#{ruby_version};./configure"
|
30
|
+
on default, "cd ruby-#{ruby_version};make"
|
31
|
+
on default, "cd ruby-#{ruby_version};make install"
|
27
32
|
end
|
28
33
|
|
29
34
|
step 'update gem on the SUT and install bundler' do
|
@@ -17,6 +17,6 @@ test_name 'Install beaker and checkout branch if necessary' do
|
|
17
17
|
step 'Build the gem and install it on the local system' do
|
18
18
|
build_output = on(default, 'cd /opt/beaker/;gem build beaker.gemspec').stdout
|
19
19
|
version = build_output.match(/^ File: (.+)$/)[1]
|
20
|
-
on(default, "cd /opt/beaker/;gem install #{version} --no-
|
20
|
+
on(default, "cd /opt/beaker/;gem install #{version} --no-document; gem install beaker-vmpooler")
|
21
21
|
end
|
22
22
|
end
|
data/beaker.gemspec
CHANGED
@@ -38,12 +38,12 @@ Gem::Specification.new do |s|
|
|
38
38
|
# Run time dependencies
|
39
39
|
s.add_runtime_dependency 'minitest', '~> 5.4'
|
40
40
|
s.add_runtime_dependency 'minitar', '~> 0.6'
|
41
|
-
s.add_runtime_dependency 'pry-byebug', '~> 3.
|
41
|
+
s.add_runtime_dependency 'pry-byebug', '~> 3.6'
|
42
42
|
# pry-byebug can have issues with native readline libs so add rb-readline
|
43
43
|
s.add_runtime_dependency 'rb-readline', '~> 0.5.3'
|
44
44
|
|
45
45
|
s.add_runtime_dependency 'hocon', '~> 1.0'
|
46
|
-
s.add_runtime_dependency 'net-ssh', '~>
|
46
|
+
s.add_runtime_dependency 'net-ssh', '~> 5.0'
|
47
47
|
s.add_runtime_dependency 'net-scp', '~> 1.2'
|
48
48
|
s.add_runtime_dependency 'inifile', '~> 3.0'
|
49
49
|
|
data/lib/beaker/host/cisco.rb
CHANGED
@@ -5,6 +5,19 @@ end
|
|
5
5
|
module Cisco
|
6
6
|
class Host < Unix::Host
|
7
7
|
|
8
|
+
# as the cisco hosts tend to have custom
|
9
|
+
# ssh configuration, the presets
|
10
|
+
# do not apply where verification of the
|
11
|
+
# host keys is disabled
|
12
|
+
def platform_defaults
|
13
|
+
h = Beaker::Options::OptionsHash.new
|
14
|
+
h.merge({
|
15
|
+
'ssh' => {
|
16
|
+
:verify_host_key => false,
|
17
|
+
},
|
18
|
+
})
|
19
|
+
end
|
20
|
+
|
8
21
|
# Tells you whether a host platform supports beaker's
|
9
22
|
# {Beaker::HostPrebuiltSteps#set_env} method
|
10
23
|
#
|
@@ -23,7 +23,7 @@ module Beaker
|
|
23
23
|
SLES_PACKAGES = ['curl', 'ntp']
|
24
24
|
DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release']
|
25
25
|
CUMULUS_PACKAGES = ['curl', 'ntpdate']
|
26
|
-
SOLARIS10_PACKAGES = ['CSWcurl', 'CSWntp']
|
26
|
+
SOLARIS10_PACKAGES = ['CSWcurl', 'CSWntp', 'wget']
|
27
27
|
SOLARIS11_PACKAGES = ['curl', 'ntp']
|
28
28
|
ETC_HOSTS_PATH = "/etc/hosts"
|
29
29
|
ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
|
data/lib/beaker/version.rb
CHANGED
@@ -2,7 +2,9 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Cisco
|
4
4
|
describe Host do
|
5
|
-
let(:options) { @options ? @options : {
|
5
|
+
let(:options) { @options ? @options : {
|
6
|
+
:user => 'root',
|
7
|
+
} }
|
6
8
|
let(:platform) {
|
7
9
|
if @platform
|
8
10
|
{ :platform => Beaker::Platform.new( @platform) }
|
@@ -58,6 +60,7 @@ module Cisco
|
|
58
60
|
it 'retains user-specified prepend commands when adding vrf' do
|
59
61
|
@options = {
|
60
62
|
:vrf => 'fakevrf',
|
63
|
+
:user => 'root',
|
61
64
|
}
|
62
65
|
answer_prepend_commands = 'prepend'
|
63
66
|
answer_correct = 'source /etc/profile;ip netns exec fakevrf prepend'
|
@@ -92,7 +95,10 @@ module Cisco
|
|
92
95
|
end
|
93
96
|
|
94
97
|
it 'retains user-specified prepend commands when adding vrf' do
|
95
|
-
@options = {
|
98
|
+
@options = {
|
99
|
+
:vrf => 'fakevrf',
|
100
|
+
:user => 'root',
|
101
|
+
}
|
96
102
|
answer_prepend_commands = 'prepend'
|
97
103
|
answer_correct = 'source /etc/profile;ip netns exec fakevrf prepend'
|
98
104
|
answer_test = host.prepend_commands( 'fake_command', answer_prepend_commands )
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: beaker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.
|
4
|
+
version: 4.7.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-04-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -176,14 +176,14 @@ dependencies:
|
|
176
176
|
requirements:
|
177
177
|
- - "~>"
|
178
178
|
- !ruby/object:Gem::Version
|
179
|
-
version: 3.
|
179
|
+
version: '3.6'
|
180
180
|
type: :runtime
|
181
181
|
prerelease: false
|
182
182
|
version_requirements: !ruby/object:Gem::Requirement
|
183
183
|
requirements:
|
184
184
|
- - "~>"
|
185
185
|
- !ruby/object:Gem::Version
|
186
|
-
version: 3.
|
186
|
+
version: '3.6'
|
187
187
|
- !ruby/object:Gem::Dependency
|
188
188
|
name: rb-readline
|
189
189
|
requirement: !ruby/object:Gem::Requirement
|
@@ -218,14 +218,14 @@ dependencies:
|
|
218
218
|
requirements:
|
219
219
|
- - "~>"
|
220
220
|
- !ruby/object:Gem::Version
|
221
|
-
version: '
|
221
|
+
version: '5.0'
|
222
222
|
type: :runtime
|
223
223
|
prerelease: false
|
224
224
|
version_requirements: !ruby/object:Gem::Requirement
|
225
225
|
requirements:
|
226
226
|
- - "~>"
|
227
227
|
- !ruby/object:Gem::Version
|
228
|
-
version: '
|
228
|
+
version: '5.0'
|
229
229
|
- !ruby/object:Gem::Dependency
|
230
230
|
name: net-scp
|
231
231
|
requirement: !ruby/object:Gem::Requirement
|