beaker 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49a51b9e8d62155af1c109fe8edca707595c46ca
-  data.tar.gz: 20ebdd88c744771efa47cf79811fbfb0db2dddd3
+  metadata.gz: b271889e27629318af4cfeae6f5a96b67f06305a
+  data.tar.gz: 5a072c8fbdacdaafcf225362f86bd1d0eb873421
 SHA512:
-  metadata.gz: 2a0338731f2679539e2acfd39397fafb9dd658d6cb9f3c97f148e58f0f8d4380878349693926ba82096322ae19f1c3bcd4c36a9bcf6c577039f80d79b26f2c99
-  data.tar.gz: a080d53d6936470b925a16e13e6f851871f6e02187d5006c3ff799e487a93befb57a0302d8c905c1cd341142178162a1bf1e46512c723d03256d07fe3410e1ac
+  metadata.gz: ac3ef7b50eb426948b40cc602b7cc3523296a8a5e1b336c629f6c33fddd5b8f517402bf2295f3df2e0b2181c300a771e86a698d174ce4abcb4c852ed96fbd02e
+  data.tar.gz: 07a6a12a9433cf6b1c9486657463fb5795995bdc765baa5219fb1d0987960bb55415d350624979043b7842deee290df96d0506a90d4ec18258570bfed1804425

data/CHANGELOG.md

@@ -11,7 +11,17 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.7.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.8.0...master)
+
+# [4.8.0](https://github.com/puppetlabs/beaker/compare/4.7.0...4.8.0) - 2019-04-17
+
+### Added
+
+- Support for Fedora >= 30 (BKR-1589)
+- Codenames for Ubuntu 18.10, 19.04, and 19.10
+
+### Changed
+- Remove "repos-pe" prefix for repo filenames
 
 # [4.7.0](https://github.com/puppetlabs/beaker/compare/4.6.0...4.7.0) - 2019-04-17
 

data/acceptance/fixtures/package/deb/pl-puppetserver-latest-jessie.list

@@ -0,0 +1 @@
+deb http://nightlies.puppetlabs.com/puppetserver-latest/repos/apt/jessie jessie PC1

data/acceptance/tests/base/host/packages.rb

@@ -49,6 +49,8 @@ step '#install_package and #uninstall_package : remove and install a package suc
 hosts.each do |host|
   # this works on Windows as well, althought it pulls in
   # a lot of dependencies.
+  # skipping this test for windows since it requires a restart
+  next if host['platform'] =~ /windows/
   package = 'zsh'
   package = 'CSWzsh' if host['platform'] =~ /solaris-10/
   package = 'git' if host['platform'] =~ /sles/

data/lib/beaker/host/unix/exec.rb

@@ -166,7 +166,7 @@ module Unix::Exec
     case self['platform']
     when /debian|ubuntu|cumulus|huaweios/
       exec(Beaker::Command.new("service ssh restart"))
-    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9])|archlinux-/
+    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))

data/lib/beaker/host/unix/file.rb

@@ -119,7 +119,6 @@ module Unix::File
       fedora_prefix = ((variant == 'fedora') ? 'f' : '')
 
       pattern = "%s-%s%s-%s.repo"
-      pattern = "repos-pe-#{pattern}" if self.is_pe?
 
       repo_filename << pattern % [
         variant,

data/lib/beaker/host/unix/pkg.rb

@@ -77,7 +77,7 @@ module Unix::Pkg
         execute("zypper --non-interactive --gpg-auto-import-keys in #{name}", opts)
       when /el-4/
         @logger.debug("Package installation not supported on rhel4")
-      when /fedora-(2[2-9])/
+      when /fedora-(2[2-9]|3[0-9])/
         if version
           name = "#{name}-#{version}"
         end
@@ -168,7 +168,7 @@ module Unix::Pkg
         execute("zypper --non-interactive rm #{name}", opts)
       when /el-4/
         @logger.debug("Package uninstallation not supported on rhel4")
-      when /edora-(2[2-9])/
+      when /edora-(2[2-9]|3[0-9])/
         execute("dnf -y #{cmdline_args} remove #{name}", opts)
       when /cisco|fedora|centos|redhat|eos|el-/
         execute("yum -y #{cmdline_args} remove #{name}", opts)
@@ -198,7 +198,7 @@ module Unix::Pkg
         execute("zypper --non-interactive --no-gpg-checks up #{name}", opts)
       when /el-4/
         @logger.debug("Package upgrade is not supported on rhel4")
-      when /fedora-(2[2-9])/
+      when /fedora-(2[2-9]|3[0-9])/
         execute("dnf -y #{cmdline_args} update #{name}", opts)
       when /cisco|fedora|centos|redhat|eos|el-/
         execute("yum -y #{cmdline_args} update #{name}", opts)
@@ -511,7 +511,7 @@ module Unix::Pkg
     case variant
     when /^(fedora|el|redhat|centos)$/
       command_name = 'yum'
-      command_name = 'dnf 'if variant == 'fedora' && version > 21 && version <= 29
+      command_name = 'dnf' if variant == 'fedora' && version > 21
       execute("#{command_name} --nogpgcheck localinstall -y #{onhost_package_file}")
     when /^(sles)$/
       execute("zypper --non-interactive --no-gpg-checks in #{onhost_package_file}")

data/lib/beaker/host_prebuilt_steps.rb

@@ -450,7 +450,7 @@ module Beaker
         #restart sshd
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
-        elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9])/
+        elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9]|3[0-9])/
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})

data/lib/beaker/platform.rb

@@ -12,7 +12,10 @@ module Beaker
                      "wheezy"  => "7",
                      "squeeze" => "6",
                    },
-        :ubuntu => { "bionic"  => "1804",
+        :ubuntu => { "eoan"    => "1910",
+                     "disco"   => "1904",
+                     "cosmic"  => "1810",
+                     "bionic"  => "1804",
                      "artful"  => "1710",
                      "zesty"   => "1704",
                      "yakkety" => "1610",

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.7.0'
+    STRING = '4.8.0'
   end
 end

data/spec/beaker/host/unix/file_spec.rb

@@ -114,7 +114,7 @@ module Beaker
         @platform = 'el-21-x86_64'
         allow( instance ).to receive( :is_pe? ) { true }
         filename = instance.repo_filename( 'pkg_name', 'pkg_version9' )
-        correct = 'pl-pkg_name-pkg_version9-repos-pe-el-21-x86_64.repo'
+        correct = 'pl-pkg_name-pkg_version9-el-21-x86_64.repo'
         expect( filename ).to be === correct
       end
 

data/spec/beaker/host/unix/pkg_spec.rb

@@ -239,7 +239,7 @@ module Beaker
         end
       end
 
-      (22..29).to_a.each do | fedora_release |
+      (22..39).to_a.each do | fedora_release |
         it "uses dnf on fedora-#{fedora_release}" do
           @opts = {'platform' => "fedora-#{fedora_release}-is-me"}
           pkg = 'fedora_package'
@@ -277,7 +277,7 @@ module Beaker
           end
         end
 
-        (22..29).to_a.each do | fedora_release |
+        (22..39).to_a.each do | fedora_release |
           it "uses dnf on fedora-#{fedora_release}" do
             @opts = {'platform' => "fedora-#{fedora_release}-is-me"}
             pkg = 'fedora_package'
@@ -515,8 +515,8 @@ module Beaker
         allow( instance ).to receive( :[] ).with( 'platform' ) { platform_mock }
       end
 
-      it 'Fedora 22-29: uses dnf' do
-        (22...29).each do |version|
+      it 'Fedora 22-39: uses dnf' do
+        (22...39).each do |version|
           @version = version
           package_file = 'test_123.yay'
           expect( instance ).to receive( :execute ).with( /^dnf.*#{package_file}$/ )
@@ -524,10 +524,10 @@ module Beaker
         end
       end
 
-      it 'Fedora 21 & 30: uses yum' do
+      it 'Fedora 21 uses yum' do
         package_file = 'testing_456.yay'
         platform_mock = Object.new
-        [21, 30].each do |version|
+        [21].each do |version|
           @version = version
           expect( instance ).to receive( :execute ).with( /^yum.*#{package_file}$/ )
           instance.install_local_package( package_file )

data/spec/helpers.rb

@@ -130,7 +130,7 @@ module PlatformHelpers
                      'huaweios']
 
 
-  FEDORASYSTEMD    = (14..29).to_a.collect! { |i| "fedora-#{i}" }
+  FEDORASYSTEMD    = (14..39).to_a.collect! { |i| "fedora-#{i}" }
 
   SYSTEMDPLATFORMS = ['el-7',
                       'centos-7',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -395,6 +395,7 @@ files:
 - acceptance/fixtures/module/spec/spec_helper_acceptance.rb
 - acceptance/fixtures/module/tests/init.pp
 - acceptance/fixtures/module/vendor/bundle/ruby/gems.txt
+- acceptance/fixtures/package/deb/pl-puppetserver-latest-jessie.list
 - acceptance/fixtures/package/deb/pl-puppetserver-latest-lucid.list
 - acceptance/fixtures/package/deb/pl-puppetserver-latest-precise.list
 - acceptance/fixtures/package/deb/pl-puppetserver-latest-squeeze.list
@@ -454,7 +455,6 @@ files:
 - acceptance/tests/base/host/host_test.rb
 - acceptance/tests/base/host/packages.rb
 - acceptance/tests/base/host/packages_unix.rb
-- acceptance/tests/base/host/reboot_test.rb
 - acceptance/tests/base/host/user_test.rb
 - acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb
 - acceptance/tests/base/test_suite/export.rb

data/acceptance/tests/base/host/reboot_test.rb

@@ -1,8 +0,0 @@
-test_name 'Reboot Test' do
-  step "#reboot: can reboot the host" do
-    hosts.each do |host|
-      host.reboot
-      on host, "echo #{host} rebooted!"
-    end
-  end
-end