beaker 5.8.1 → 6.1.0

data/spec/helpers.rb

@@ -120,32 +120,17 @@ module HostHelpers
 end
 
 module PlatformHelpers
-  DEBIANPLATFORMS = %w[debian
-                       ubuntu
-                       cumulus
-                       huaweios]
-
-  FEDORASYSTEMD    = (14..39).to_a.collect! { |i| "fedora-#{i}" }
-
-  SYSTEMDPLATFORMS = %w[amazon-2023
-                        el-7
-                        centos-7
-                        redhat-7
-                        oracle-7
-                        scientific-7
-                        eos-7
-                        el-8
-                        centos-8
-                        redhat-8
-                        oracle-8].concat(FEDORASYSTEMD)
-
-  FEDORASYSTEMV    = (1..13).to_a.collect! { |i| "fedora-#{i}" }
-
-  SYSTEMVPLATFORMS = ['el-',
-                      'centos',
-                      'fedora',
-                      'redhat',
-                      'oracle',
-                      'scientific',
-                      'eos',].concat(FEDORASYSTEMV)
+  DEBIANPLATFORMS = %w[debian ubuntu]
+
+  REDHATPLATFORMS = %w[
+    amazon-2023
+    amazon-2
+    fedora
+    el-
+    centos
+    redhat
+    oracle
+    scientific
+    archlinux
+  ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -344,7 +344,6 @@ files:
 - acceptance/fixtures/module/spec/acceptance/nodesets/centos-64-x64.yml
 - acceptance/fixtures/module/spec/acceptance/nodesets/centos-65-x64.yml
 - acceptance/fixtures/module/spec/acceptance/nodesets/default.yml
-- acceptance/fixtures/module/spec/acceptance/nodesets/fedora-18-x64.yml
 - acceptance/fixtures/module/spec/acceptance/nodesets/internal-vpool.yml
 - acceptance/fixtures/module/spec/acceptance/nodesets/sles-11-x64.yml
 - acceptance/fixtures/module/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -369,15 +368,6 @@ files:
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-el-6-x86_64.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-el-7-i386.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-el-7-x86_64.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-20-i386.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-20-x86_64.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-21-i386.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-21-x86_64.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-i386.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-x86_64.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-i386.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-x86_64.repo
-- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-24-x86_64.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-sles-12-x86_64.repo
 - acceptance/lib/helpers/test_helper.rb
 - acceptance/pre_suite/README.md
@@ -447,8 +437,6 @@ files:
 - docs/how_to/enabling_cross_sut_access.md
 - docs/how_to/hosts/README.md
 - docs/how_to/hosts/archlinux.md
-- docs/how_to/hosts/cisco.md
-- docs/how_to/hosts/eos.md
 - docs/how_to/hypervisors/README.md
 - docs/how_to/hypervisors/solaris.md
 - docs/how_to/install_puppet.md
@@ -501,8 +489,6 @@ files:
 - lib/beaker/host/aix/file.rb
 - lib/beaker/host/aix/group.rb
 - lib/beaker/host/aix/user.rb
-- lib/beaker/host/cisco.rb
-- lib/beaker/host/eos.rb
 - lib/beaker/host/freebsd.rb
 - lib/beaker/host/freebsd/exec.rb
 - lib/beaker/host/freebsd/pkg.rb
@@ -580,8 +566,6 @@ files:
 - spec/beaker/dsl/test_tagging_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
 - spec/beaker/host/aix_spec.rb
-- spec/beaker/host/cisco_spec.rb
-- spec/beaker/host/eos_spec.rb
 - spec/beaker/host/freebsd/exec_spec.rb
 - spec/beaker/host/freebsd/pkg_spec.rb
 - spec/beaker/host/mac/exec_spec.rb

data/acceptance/fixtures/module/spec/acceptance/nodesets/fedora-18-x64.yml

@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-20-i386.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f20/PC1/i386/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-20-x86_64.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f20/PC1/x86_64/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-21-i386.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f21/PC1/i386/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-21-x86_64.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f21/PC1/x86_64/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-i386.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f22/PC1/i386/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-x86_64.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f22/PC1/x86_64/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-i386.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f23/PC1/i386/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-x86_64.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f23/PC1/x86_64/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-24-x86_64.repo

@@ -1,6 +0,0 @@
-[pl-puppetserver-latest]
-name=PL Repo for puppetserver at commit latest
-baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f24/PC1/x86_64/
-enabled=1
-gpgcheck=1
-gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/docs/how_to/hosts/cisco.md

@@ -1,40 +0,0 @@
-# Wind River Linux
-
-Wind River Linux is an embedded systems OS from Wind, an Intel Company.  You can get more details on this from their [product page](http://www.windriver.com/products/linux/).
-
-Beaker provides support for 2 of Cisco's Wind River Linux platforms. Those platform codenames are `cisco_nexus` for Cisco NX-OS based systems and `cisco_ios_xr` for Cisco IOS XR based systems.
-
-Beaker currently can install puppet on Cisco Nexus and Cisco IOS XR.
-
-# Host Requirements
-
-WRLinux hosts validate their setup once created, and will fail if not setup correctly.  There are two conditions that are validated specifically on WRLinux hosts.  These conditions are listed below.
-
-A. All Cisco Nexus hosts will need a `:vrf` value, which determines their virtual routing framework for networking purposes.  For our purposes, we tend to use the value `management`, so there is always a hosts file line that looks like this in our configuration:
-
-    HOSTS:
-      <hostname>:
-        ...
-        vrf: management
-
-B. All Cisco hosts will also require a user to be set on the hosts. This is because they don't allow ssh'ing as the root user, which is one of the main assumptions that Beaker operates under in the usual case. In order to specify a user to ssh with, add this block to a host:
-
-    HOSTS:
-      <hostname>:
-        ...
-        ssh:
-          user: <username>
-
-# Hypervisors
-
-WRLinux has only been developed and tested as a [vmpooler](https://github.com/puppetlabs/vmpooler) host.
-
-This doesn't mean that it can't be used in another hypervisor, but that Beaker doesn't specifically deal with the details of that hypervisor in creating WRLinux hosts, if there is anything specific to WRLinux that will need to be done in provisioning steps.
-
-# Installation Methods
-
-## Open Source
-
-In order to install a puppet-agent against a WRLinux host, you'll have to use the [`install_puppet_agent_on`](blob/master/lib/beaker/dsl/install_utils/foss_utils.rb#L327) method.
-
-It reaches out to the WRLinux-specific host code for any information that it needs. You can check out [these methods](blob/master/lib/beaker/host/cisco.rb) if you need more information about this.

data/docs/how_to/hosts/eos.md

@@ -1,11 +0,0 @@
-# EOS - Arista
-
-EOS is the network device OS from Arista. You can get more details from their [product page](https://www.arista.com/en/products/eos).
-
-It reaches out to the EOS-specific host code for any information that it needs. You can check out [these methods](blob/master/lib/beaker/host/eos.rb) if you need more information about this.
-
-# Hypervisors
-
-EOS has only been developed and tested as a [vmpooler](https://github.com/puppetlabs/vmpooler) host.
-
-This doesn't mean that it can't be used in another hypervisor, but that Beaker doesn't specifically deal with the details of that hypervisor in creating EOS hosts, if there is anything specific to EOS that will need to be done in provisioning steps.

data/lib/beaker/host/cisco.rb

@@ -1,159 +0,0 @@
-%w[host command_factory].each do |lib|
-  require "beaker/#{lib}"
-end
-
-module Cisco
-  class Host < Unix::Host
-    # as the cisco hosts tend to have custom
-    # ssh configuration, the presets
-    # do not apply where verification of the
-    # host keys is disabled
-    def platform_defaults
-      h = Beaker::Options::OptionsHash.new
-      h.merge({
-                'ssh' => {
-                  :verify_host_key => false,
-                },
-              })
-    end
-
-    # Tells you whether a host platform supports beaker's
-    #   {Beaker::HostPrebuiltSteps#set_env} method
-    #
-    # @return [String,nil] Reason message if set_env should be skipped,
-    #   nil if it should run.
-    def skip_set_env?
-      'Cisco does not allow SSH control through the BASH shell'
-    end
-
-    # Handles host operations needed after an SCP takes place
-    #
-    # @param [String] scp_file_actual File path to actual SCP'd file on host
-    # @param [String] scp_file_target File path to target SCP location on host
-    #
-    # @return nil
-    def scp_post_operations(scp_file_actual, scp_file_target)
-      execute("mv #{scp_file_actual} #{scp_file_target}") if self[:platform].include?('cisco_nexus')
-      nil
-    end
-
-    # Handles any changes needed in a path for SCP
-    #
-    # @param [String] path File path to SCP to
-    #
-    # @return [String] path, changed if needed due to host
-    #   constraints
-    def scp_path(path)
-      if self[:platform].include?('cisco_nexus')
-        @home_dir ||= execute('pwd')
-        answer = "#{@home_dir}/#{File.basename(path)}"
-        answer << '/' if /\/$/.match?(path)
-        return answer
-      end
-      path
-    end
-
-    # Gets the repo type for the given platform
-    #
-    # @raise [ArgumentError] For an unknown platform
-    #
-    # @return [String] Type of repo (rpm|deb)
-    def repo_type
-      'rpm'
-    end
-
-    # Gets the config dir location for package information
-    #
-    # @raise [ArgumentError] For an unknown platform
-    #
-    # @return [String] Path to package config dir
-    def package_config_dir
-      '/etc/yum/repos.d/'
-    end
-
-    # Gets the specific prepend commands as needed for this host
-    #
-    # @param [String] command Command to be executed
-    # @param [String] user_pc List of user-specified commands to prepend
-    # @param [Hash] opts optional parameters
-    #
-    # @return [String] Command string as needed for this host
-    def prepend_commands(command = '', user_pc = '', _opts = {})
-      return user_pc unless command.index('vsh').nil?
-
-      if self[:platform].include?('cisco_nexus')
-        return user_pc unless command.index('ntpdate').nil?
-      end
-
-      prepend_cmds = 'source /etc/profile;'
-      prepend_cmds << " sudo -E sh -c \"" if self[:user] != 'root'
-      prepend_cmds << "ip netns exec #{self[:vrf]} " if self[:vrf]
-      prepend_cmds << "#{user_pc} " if user_pc && !user_pc.empty?
-      prepend_cmds.strip
-    end
-
-    # Gets the specific append commands as needed for this host
-    #
-    # @param [String] command Command to be executed
-    # @param [String] user_ac List of user-specified commands to append
-    # @param [Hash] opts optional parameters
-    #
-    # @return [String] Command string as needed for this host
-    def append_commands(command = '', _user_ac = '', _opts = {})
-      command.gsub('"') { '\\"' }
-      # vsh commands, ntpdate or when user is root commands do not require an appended `"`
-      return '"' unless /ntpdate|\/isan\/bin\/vsh/.match?(command) || self[:user] == 'root'
-    end
-
-    # Construct the environment string for this command
-    #
-    # @param [Hash{String=>String}] env   An optional Hash containing
-    #                                     key-value pairs to be treated
-    #                                     as environment variables that
-    #                                     should be set for the duration
-    #                                     of the puppet command.
-    #
-    # @return [String] Returns a string containing command line arguments that
-    #                  will ensure the environment is correctly set for the
-    #                  given host.
-    def environment_string env
-      prestring = ''
-      return prestring if env.empty?
-
-      env_array = self.environment_variable_string_pair_array(env)
-      environment_string = env_array.join(' ')
-
-      prestring << if self[:platform].include?('cisco_nexus')
-                     " export"
-                   else
-                     " env"
-                   end
-      environment_string = "#{prestring} #{environment_string}"
-      environment_string << ';' if prestring.include?('export')
-      environment_string
-    end
-
-    # Validates that the host was setup correctly
-    #
-    # @return nil
-    # @raise [ArgumentError] If the host is setup incorrectly,
-    #   this will be raised with the appropriate message
-    def validate_setup
-      msg = nil
-      if self[:platform].include?('cisco_nexus')
-        msg = 'Cisco Nexus hosts must be provided with a :vrf value.' if !self[:vrf]
-        msg = 'Cisco hosts must be provided with a :user value' if !self[:user]
-      end
-      if self[:platform].include?('cisco_ios_xr')
-        msg = 'Cisco hosts must be provided with a :user value' if !self[:user]
-      end
-
-      return unless msg
-
-      msg << <<-EOF
-          Check https://github.com/puppetlabs/beaker/blob/master/docs/hosts/cisco.md for more info.'
-      EOF
-      raise ArgumentError, msg
-    end
-  end
-end

data/lib/beaker/host/eos.rb

@@ -1,33 +0,0 @@
-%w[host command_factory].each do |lib|
-  require "beaker/#{lib}"
-end
-
-module Eos
-  class Host < Unix::Host
-    # Copies a remote file to the host location specified
-    #
-    # @param [String] remote_url URL to the remote file
-    # @param [String] host_directory Path to the host directory on the host.
-    #
-    # @note in EOS, you just copy the file as an extension, you don't worry
-    #   about location, so that parameter is ignored
-    #
-    # @return [Result] The result of copying that file to the host
-    def get_remote_file(remote_url, _host_directory = '')
-      commands = ['enable', "copy #{remote_url} extension:"]
-      command = commands.join("\n")
-      execute("Cli -c '#{command}'")
-    end
-
-    # Installs an extension file already copied via {#get_remote_file} or something similar
-    #
-    # @param [String] filename Name of the file to install, including file extension
-    #
-    # @return [Result] The result of running the install command on the host
-    def install_from_file(filename)
-      commands = ['enable', "extension #{filename}"]
-      command = commands.join("\n")
-      execute("Cli -c '#{command}'")
-    end
-  end
-end