beaker 3.26.0 → 3.27.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGELOG.md +10 -1
  3. data/acceptance/lib/beaker/acceptance/install_utils.rb +1 -1
  4. data/lib/beaker/host/unix/exec.rb +2 -2
  5. data/lib/beaker/host/unix/pkg.rb +3 -3
  6. data/lib/beaker/host_prebuilt_steps.rb +5 -5
  7. data/lib/beaker/perf.rb +3 -3
  8. data/lib/beaker/platform.rb +8 -6
  9. data/lib/beaker/version.rb +1 -1
  10. data/spec/beaker/host_prebuilt_steps_spec.rb +1 -1
  11. data/spec/helpers.rb +1 -0
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YzEzMDg4NDk0ZTdlM2UyMDhjYTJkOGRjMjIxZDc2MWEzNzZhMmVhZA==
4
+ ZjliYzUxMDQyMjEzOWZlMzcxN2NmMTZiYTBhNzkwM2Q5OGJmODdmOQ==
5
5
  data.tar.gz: !binary |-
6
- MDNkYzZiNGE1MTU2Mzk1OTgwZmI4YTM3NDdhYmRiZDQwOGQzNjdiZg==
6
+ ZDg0NDJhZTI2YTQyMjAwYWRmZjEyODUyZTIzZjk2YWUwYWVmZjhkOA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NjliNDg3MmM0MjA1ZGViZGVkZTAyMzA4ZWFlY2EwNmMyMWU3OGM0NTIyOWU1
10
- YzIxODQ2YzhkNmZlMDYwOGEzMjUyZjg4MGViMzY5M2I4NjNkN2E2Y2MzZTdh
11
- YzI5OGM1YWNjNTUwMjZhOTMyN2IyM2E5MzcwNDEwMWZlYTRiODM=
9
+ YWQ2NGIxZTgzYjRiMzYxYjFjYzQ1YTk2ZjA2NmNiMmM2NmM3NTk1MmY5MTQy
10
+ MzI4ZWY4NzllOWQxZTBlYjNiZTIzNmI4MDUxYmU1ZDc0MjhlZWU0YzEyODMy
11
+ MjA2ZmU1MDFhY2JiYTk1NTVkZDZiYjkyZWM1MDYyMTRmMmY0N2E=
12
12
  data.tar.gz: !binary |-
13
- YzM3OGJhYzY4ZmU3YWVjMjNhMmM0NDA4MmI2NDkyODZmNWE4ZjNmYWVjNGM1
14
- ZTFlNjU3ZmRjMmY1ZmEzYzk0MDg0NmE2ZGMzODdiM2I0ODVlODNkNDZhOWFh
15
- ODNmOWFiMTQ0MTc2Y2I4Y2ZmMGZhM2I0ZDNiMTMzMjNhYmY0NmU=
13
+ MjdmNDQxNTYxNWNmMjJlNGMwYTYzYWIzODdmMGIzMzUyNWY2ZTBjZGNlODY5
14
+ ZTNjNTFjMjUyNzczOWM1YzgyOTc3NjUyODllYTk4NmZiOWVhZmRhYWY0OTFm
15
+ YTY0YmFkNThhMWRhMTFlMTcxMmFkZGZkMjE3YWY3ODllNTk2ZmQ=
data/CHANGELOG.md CHANGED
@@ -11,7 +11,16 @@ 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/3.25.0...master)
14
+ # [Unreleased](https://github.com/puppetlabs/beaker/compare/3.27.0...master)
15
+
16
+ # [3.27.0](https://github.com/puppetlabs/beaker/compare/3.26.0...3.27.0) - 2017-10-19
17
+
18
+ ### Added
19
+
20
+ - support amazon as a platform
21
+ - add codenames for MacOS 10.13 and Ubuntu Artful
22
+
23
+ # [3.26.0](https://github.com/puppetlabs/beaker/compare/3.25.0...3.26.0) - 2017-10-05
15
24
 
16
25
  ### Added
17
26
 
data/acceptance/lib/beaker/acceptance/install_utils.rb CHANGED
@@ -3,7 +3,7 @@ module Beaker
3
3
  module InstallUtils
4
4
 
5
5
  PLATFORM_PATTERNS = {
6
- :redhat => /fedora|el|centos/,
6
+ :redhat => /fedora|el|centos|amazon/,
7
7
  :debian => /debian|ubuntu/,
8
8
  :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
9
9
  :solaris_10 => /solaris-10/,
data/lib/beaker/host/unix/exec.rb CHANGED
@@ -168,7 +168,7 @@ module Unix::Exec
168
168
  exec(Beaker::Command.new("service ssh restart"))
169
169
  when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9])|archlinux-/
170
170
  exec(Beaker::Command.new("systemctl restart sshd.service"))
171
- when /el-|centos|fedora|redhat|oracle|scientific|eos/
171
+ when /el-|centos|fedora|redhat|amazon|oracle|scientific|eos/
172
172
  exec(Beaker::Command.new("/sbin/service sshd restart"))
173
173
  when /sles/
174
174
  exec(Beaker::Command.new("rcsshd restart"))
@@ -196,7 +196,7 @@ module Unix::Exec
196
196
  directory = create_tmpdir_on(self)
197
197
  exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
198
198
  exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
199
- when /el-|centos|fedora|redhat|oracle|scientific|eos/
199
+ when /el-|centos|fedora|redhat|amazon|oracle|scientific|eos/
200
200
  directory = create_tmpdir_on(self)
201
201
  exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
202
202
  exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
data/lib/beaker/host/unix/pkg.rb CHANGED
@@ -39,7 +39,7 @@ module Unix::Pkg
39
39
  when /el-4/
40
40
  @logger.debug("Package query not supported on rhel4")
41
41
  return false
42
- when /cisco|fedora|centos|eos|el-/
42
+ when /cisco|fedora|amazon|centos|eos|el-/
43
43
  result = execute("rpm -q #{name}", opts) { |result| result }
44
44
  when /ubuntu|debian|cumulus|huaweios/
45
45
  result = execute("dpkg -s #{name}", opts) { |result| result }
@@ -407,8 +407,8 @@ module Unix::Pkg
407
407
  when /^(solaris)$/
408
408
  release_path_end, release_file = solaris_puppet_agent_dev_package_info(
409
409
  puppet_collection, puppet_agent_version, opts )
410
- when /^(sles|aix|el|centos|oracle|redhat|scientific)$/
411
- variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|scientific)/)
410
+ when /^(sles|aix|el|centos|oracle|redhat|amazon|scientific)$/
411
+ variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|amazon|scientific)/)
412
412
  arch = 'ppc' if variant == 'aix' && arch == 'power'
413
413
  version = '7.1' if variant == 'aix' && version == '7.2'
414
414
  release_path_end = "#{variant}/#{version}/#{puppet_collection}/#{arch}"
data/lib/beaker/host_prebuilt_steps.rb CHANGED
@@ -444,7 +444,7 @@ module Beaker
444
444
  host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
445
445
  elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9])/
446
446
  host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
447
- elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
447
+ elsif host['platform'] =~ /centos|el-|redhat|amazon|fedora|eos/
448
448
  host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
449
449
  elsif host['platform'] =~ /(free|open)bsd/
450
450
  host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
@@ -463,7 +463,7 @@ module Beaker
463
463
  def disable_se_linux host, opts
464
464
  logger = opts[:logger]
465
465
  block_on host do |host|
466
- if host['platform'] =~ /centos|el-|redhat|fedora|eos/
466
+ if host['platform'] =~ /centos|el-|redhat|amazon|fedora|eos/
467
467
  @logger.debug("Disabling se_linux on #{host.name}")
468
468
  host.exec(Command.new("sudo su -c \"setenforce 0\""), {:pty => true})
469
469
  else
@@ -479,7 +479,7 @@ module Beaker
479
479
  def disable_iptables host, opts
480
480
  logger = opts[:logger]
481
481
  block_on host do |host|
482
- if host['platform'] =~ /centos|el-|redhat|fedora|eos/
482
+ if host['platform'] =~ /centos|el-|redhat|amazon|fedora|eos/
483
483
  logger.debug("Disabling iptables on #{host.name}")
484
484
  host.exec(Command.new("sudo su -c \"/etc/init.d/iptables stop\""), {:pty => true})
485
485
  else
@@ -502,7 +502,7 @@ module Beaker
502
502
  case host['platform']
503
503
  when /ubuntu/, /debian/, /cumulus/
504
504
  host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
505
- when /^el-/, /centos/, /fedora/, /redhat/, /eos/
505
+ when /^el-/, /centos/, /fedora/, /redhat/, /amazon/, /eos/
506
506
  host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
507
507
  else
508
508
  logger.debug("Attempting to enable package manager proxy support on non-supported platform: #{host.name}: #{host['platform']}")
@@ -596,7 +596,7 @@ module Beaker
596
596
  #
597
597
  # @return [Boolean] if the host is el_based
598
598
  def el_based? host
599
- ['centos','redhat','scientific','el','oracle'].include?(host['platform'].variant)
599
+ ['centos','redhat','amazon','scientific','el','oracle'].include?(host['platform'].variant)
600
600
  end
601
601
 
602
602
  end
data/lib/beaker/perf.rb CHANGED
@@ -4,8 +4,8 @@ module Beaker
4
4
 
5
5
  PERF_PACKAGES = ['sysstat']
6
6
  # SLES does not treat sysstat as a service that can be started
7
- PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|sles/
8
- PERF_START_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus/
7
+ PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|amazon|centos|oracle|scientific|fedora|el|eos|cumulus|sles/
8
+ PERF_START_PLATFORMS = /debian|ubuntu|redhat|amazon|centos|oracle|scientific|fedora|el|eos|cumulus/
9
9
 
10
10
  # Create the Perf instance and runs setup_perf_on_host on all hosts if --collect-perf-data
11
11
  # was used as an option on the Baker command line invocation. Instances of this class do not
@@ -50,7 +50,7 @@ module Beaker
50
50
  @logger.perf_output("Enabling aggressive sysstat polling")
51
51
  if host['platform'] =~ /debian|ubuntu/
52
52
  host.exec(Command.new('sed -i s/5-55\\\/10/*/ /etc/cron.d/sysstat'))
53
- elsif host['platform'] =~ /centos|el|fedora|oracle|redhats|scientific/
53
+ elsif host['platform'] =~ /centos|el|fedora|oracle|redhats|amazon|scientific/
54
54
  host.exec(Command.new('sed -i s/*\\\/10/*/ /etc/cron.d/sysstat'))
55
55
  end
56
56
  end
data/lib/beaker/platform.rb CHANGED
@@ -3,7 +3,7 @@ module Beaker
3
3
  # all String methods while adding several platform-specific use cases.
4
4
  class Platform < String
5
5
  # Supported platforms
6
- PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
6
+ PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|amazon|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
7
7
  # Platform version numbers vs. codenames conversion hash
8
8
  PLATFORM_VERSION_CODES =
9
9
  { :debian => { "stretch" => "9",
@@ -11,7 +11,8 @@ module Beaker
11
11
  "wheezy" => "7",
12
12
  "squeeze" => "6",
13
13
  },
14
- :ubuntu => { "zesty" => "1704",
14
+ :ubuntu => { "artful" => "1710",
15
+ "zesty" => "1704",
15
16
  "yakkety" => "1610",
16
17
  "xenial" => "1604",
17
18
  "wily" => "1510",
@@ -24,10 +25,11 @@ module Beaker
24
25
  "precise" => "1204",
25
26
  "lucid" => "1004",
26
27
  },
27
- :osx => { "sierra" => "1012",
28
- "elcapitan" => "1011",
29
- "yosemite" => "1010",
30
- "mavericks" => "109",
28
+ :osx => { "highsierra" => "1013",
29
+ "sierra" => "1012",
30
+ "elcapitan" => "1011",
31
+ "yosemite" => "1010",
32
+ "mavericks" => "109",
31
33
  }
32
34
  }
33
35
 
data/lib/beaker/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Beaker
2
2
  module Version
3
- STRING = '3.26.0'
3
+ STRING = '3.27.0'
4
4
  end
5
5
  end
data/spec/beaker/host_prebuilt_steps_spec.rb CHANGED
@@ -85,7 +85,7 @@ describe Beaker do
85
85
  ]
86
86
  end
87
87
 
88
- ['centos','el-','redhat','fedora','eos'].each do | rhel_like |
88
+ ['centos','el-','redhat','fedora','amazon','eos'].each do | rhel_like |
89
89
  it_should_behave_like 'enables_root_login', rhel_like, [
90
90
  "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
91
91
  "sudo -E /sbin/service sshd reload"
data/spec/helpers.rb CHANGED
@@ -146,6 +146,7 @@ module PlatformHelpers
146
146
  'fedora',
147
147
  'redhat',
148
148
  'oracle',
149
+ 'amazon',
149
150
  'scientific',
150
151
  'eos'].concat(FEDORASYSTEMV)
151
152
  end
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: 3.26.0
4
+ version: 3.27.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-05 00:00:00.000000000 Z
11
+ date: 2017-10-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec