beaker-puppet 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f9dff9d57b28cd3bd634842fdb9cadb179139c
-  data.tar.gz: 94a363edc67c9d806dcd97f99d331bb3ad7a21d8
+  metadata.gz: de946f1d393facad35ab19ca4864743772344082
+  data.tar.gz: 01993f13f7f622a4ab94928b681640a07ce9706b
 SHA512:
-  metadata.gz: ea5fa35c971236f41bdc364f2d6c9f1d73f8009fda38a30da915ff5d36d4033e77f716dbd5ac3b31b59d155bbf0eaa29dbb88984fcdd51b75dfd3b2b443f28f0
-  data.tar.gz: 9b6ddd716275eb8ce105ebc3b36c035e2d835c24ab8a342db70a8740b532fa3e5286e86b631c2cd7cdf92d2f3b003168910c509ab23902fe4f29a247ad69e529
+  metadata.gz: e1b58fa827fa766d54f3d900c2a7a8b2ffe9dd8ddb3ae54d8a19c23ab88f6b0a6674d45d3b23d46569c8ffec0135ba1bc7714196f4ba24ac2a3cb7ab402cb90f
+  data.tar.gz: 4d21d18da09e34b826d7a9218a7dce6eef26aeec1745e4289940e7a655332e6bc6563e31d16e7bece336700aedc83238c741ba6947ec560de3a99faa09b74165

data/lib/beaker-puppet/install_utils/aio_defaults.rb

@@ -23,8 +23,13 @@ module Beaker
           # include sys/ruby) and the newer versions, which have no custom ruby
           # directory
           'windows' => { # windows with cygwin
-            'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
-            'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
+            'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin',
+            'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin',
+            'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
+          },
+          'windows-64' => { # windows with cygwin
+            'puppetbindir'      => '/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
+            'privatebindir'     => '/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
             'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
           },
           'pswindows' => { # pure windows
@@ -57,7 +62,16 @@ module Beaker
             if host.is_powershell?
               platform = 'pswindows'
             elsif host['platform'] =~ /windows/
-              platform = 'windows'
+              if host[:ruby_arch] == 'x64'
+                ruby_arch = /-64/
+              else
+                ruby_arch = /-32/
+              end
+              if host['platform'] =~ ruby_arch
+                platform = 'windows-64'
+              else
+                platform = 'windows'
+              end
             else
               platform = 'unix'
             end

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -1447,18 +1447,26 @@ module Beaker
           "env PATH=\"#{host['privatebindir']}:${PATH}\" ruby"
         end
 
-        def gem_command(host, type = 'aio')
-          if type == 'aio'
+        def get_command(command_name, host, type = 'aio')
+          if ['aio', 'git'].include?(type)
             if host['platform'] =~ /windows/
-              "env PATH=\"#{host['privatebindir']}:${PATH}\" cmd /c gem"
+              "env PATH=\"#{host['privatebindir']}:${PATH}\" cmd /c #{command_name}"
             else
-              "env PATH=\"#{host['privatebindir']}:${PATH}\" gem"
+              "env PATH=\"#{host['privatebindir']}:${PATH}\" #{command_name}"
             end
           else
-            on(host, 'which gem').stdout.chomp
+            on(host, "which #{command_name}").stdout.chomp
           end
         end
 
+        def bundle_command(host, type = 'aio')
+          get_command('bundle', host, type)
+        end
+
+        def gem_command(host, type = 'aio')
+          get_command('gem', host, type)
+        end
+
         # Configures gem sources on hosts to use a mirror, if specified
         # This is a duplicate of the Gemfile logic.
         def configure_gem_mirror(hosts)

data/lib/beaker-puppet/install_utils/puppet_utils.rb

@@ -21,7 +21,7 @@ module Beaker
         #    'foss'
         def normalize_type type
           case type
-          when /(\A|-)(git)|(foss)(\Z|-)/
+          when /(\A|-)foss(\Z|-)/
             'foss'
           when /(\A|-)pe(\Z|-)/
             'pe'
@@ -35,7 +35,7 @@ module Beaker
         #Given a host construct a PATH that includes puppetbindir, facterbindir and hierabindir
         # @param [Host] host    A single host to construct pathing for
         def construct_puppet_path(host)
-          path = (%w(puppetbindir facterbindir hierabindir)).compact.reject(&:empty?)
+          path = (%w(puppetbindir facterbindir hierabindir privatebindir)).compact.reject(&:empty?)
           #get the PATH defaults
           path.map! { |val| host[val] }
           path = path.compact.reject(&:empty?)

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

data/setup/git/000_EnvSetup.rb

@@ -1,68 +1,44 @@
 test_name "Setup environment"
 
-step "Ensure Git and Ruby"
+require 'json'
+require 'open-uri'
 
+step 'Configure paths' do
+  add_aio_defaults_on(hosts)
+  add_puppet_paths_on(hosts)
+end
+
+step "Install git and tar"
 PACKAGES = {
-  :redhat => [
-    'git',
-    'ruby',
-    'rubygem-json',       # invalid on RHEL6
-    'rubygem-io-console', # required for Fedora25 to bundle install
-    'rubygem-rdoc'        # required for Fedora25 to install gems
-  ],
+  :redhat => ['git'],
   :debian => [
     ['git', 'git-core'],
-    'ruby',
-  ],
-  :debian_ruby18 => [
-    'libjson-ruby',
-  ],
-  :solaris_11 => [
-    ['git', 'developer/versioning/git'],
   ],
   :solaris_10 => [
     'coreutils',
-    'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
     'git',
-    'ruby19',
-    'ruby19_dev',
-    'gcc4core',
-  ],
-  :windows => [
-    'git',
-    # there isn't a need for json on windows because it is bundled in ruby 1.9
+    'gtar',
   ],
+  :windows => ['git'],
+  :sles => ['git'],
 }
 
-# override incorrect FOSS (git) defaults from Beaker with AIO applicable ones
-#
-# Remove after PUP-4867 breaks distmoduledir and sitemoduledir into individual
-# settings from modulepath and Beaker can properly introspect these settings
-hosts.each do |host|
-  platform = host['platform'] =~ /windows/ ? 'windows' : 'unix'
-
-  host['puppetbindir'] = '/usr/bin' if platform == 'windows'
+# We need to be able override which tar we use on solaris, which we call later
+# when we unpack the puppet-runtime archive
+tar = 'tar'
 
-  # Beakers add_aio_defaults_on helper is not appropriate here as it
-  # also alters puppetbindir / privatebindir to use package installed
-  # paths rather than git installed paths
-  host['distmoduledir'] = AIO_DEFAULTS[platform]['distmoduledir']
-  host['sitemoduledir'] = AIO_DEFAULTS[platform]['sitemoduledir']
-end
-
-hosts.each do |host|
+agents.each do |host|
   case host['platform']
-  when  /solaris-10/
-    on host, 'mkdir -p /var/lib'
-    on host, 'ln -sf /opt/csw/bin/pkgutil /usr/bin/pkgutil'
-    on host, 'ln -sf /opt/csw/bin/gem19 /usr/bin/gem'
-    on host, 'ln -sf /opt/csw/bin/git /usr/bin/git'
-    on host, 'ln -sf /opt/csw/bin/ruby19 /usr/bin/ruby'
-    on host, 'ln -sf /opt/csw/bin/gstat /usr/bin/stat'
-    on host, 'ln -sf /opt/csw/bin/greadlink /usr/bin/readlink'
-  when /solaris-11/
-    step "#{host} jump through hoops to install ruby19; switch back to runtime/ruby-19 after template upgrade to sol11.2"
-    create_remote_file host, "/root/shutupsolaris", <<END
+  when /solaris/
+    tar = 'gtar'
+    if host['platform'] =~ /11/
+      # The file allows us to non-interactively install these packages with
+      # pkgutil on solaris 11. Solaris 10 does this as a part of the
+      # `install_packages_on` method in beaker. Since we install packages for
+      # solaris 11 using pkg by default, we can't use that method for sol11.
+      # We have to override it so that we can get git from opencws, as it has
+      # the updated ssl certs we need to access github repos.
+      create_remote_file host, "/root/shutupsolaris", <<-END
 mail=
 # Overwrite already installed instances
 instance=overwrite
@@ -83,60 +59,81 @@ conflict=nocheck
 action=nocheck
 # Install to the default base directory.
 basedir=default
-END
-    on host, 'pkgadd -a /root/shutupsolaris -d http://get.opencsw.org/now all'
-    on host, '/opt/csw/bin/pkgutil -U all'
-    on host, '/opt/csw/bin/pkgutil -i -y ruby19_dev'
-    on host, '/opt/csw/bin/pkgutil -i -y ruby19'
-    on host, 'ln -sf /opt/csw/bin/gem19 /usr/bin/gem'
-    on host, 'ln -sf /opt/csw/bin/ruby19 /usr/bin/ruby'
+        END
+      on host, 'pkgadd -d http://get.opencsw.org/now -a /root/shutupsolaris -n all'
+      on host, '/opt/csw/bin/pkgutil -U all'
+      on host, '/opt/csw/bin/pkgutil -y -i git'
+      on host, '/opt/csw/bin/pkgutil -y -i gtar'
+    end
+    host.add_env_var('PATH', '/opt/csw/bin')
   end
 end
 
-install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+install_packages_on(agents, PACKAGES, :check_if_exists => true)
 
-hosts.each do |host|
-  case host['platform']
-  when /windows/
-    arch = host[:ruby_arch] || 'x86'
-    step "#{host} Selected architecture #{arch}"
-
-    revision = if arch == 'x64'
-                 '2.1.x-x64'
-               else
-                 '2.1.x-x86'
-               end
-
-    step "#{host} Install ruby from git using revision #{revision}"
-    # TODO remove this step once we are installing puppet from msi packages
-    win_path = on(host, 'cygpath -m /opt/puppet-git-repos').stdout.chomp
-    install_from_git_on(host, win_path,
-                     :name => 'puppet-win32-ruby',
-                     :path => build_git_url('puppet-win32-ruby'),
-                     :rev  => revision)
-    on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /'
-    on host, 'cd /lib; icacls ruby /grant "Everyone:(OI)(CI)(RX)"'
-    on host, 'cd /lib; icacls ruby /reset /T'
-    on host, 'cd /; icacls bin /grant "Everyone:(OI)(CI)(RX)"'
-    on host, 'cd /; icacls bin /reset /T'
-    on host, 'ruby --version'
-    on host, 'cmd /c gem list'
+step "Unpack puppet-runtime" do
+  dev_builds_url = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
+  branch = ENV['RUNTIME_BRANCH'] || 'master'
+
+  # We want to grab whatever tag has been promoted most recently into the branch
+  # of puppet-agent that corresponds to whatever component we're working on.
+  # This will allow us to get the latest runtime package that has passed tests.
+  runtime_json = "https://raw.githubusercontent.com/puppetlabs/puppet-agent/#{branch}/configs/components/puppet-runtime.json"
+  runtime_tag = JSON.load(open(runtime_json))['version']
+
+  runtime_url = "#{dev_builds_url}/puppet-runtime/#{runtime_tag}/artifacts/"
+
+  runtime_prefix = "agent-runtime-#{branch}-#{runtime_tag}."
+  runtime_suffix = ".tar.gz"
+
+  agents.each do |host|
+    platform_tag = host['packaging_platform']
+    if platform_tag =~ /windows/
+      # the windows version is hard coded to `2012r2`. Unfortunately,
+      # `host['packaging_platform']` is hard coded to `2012`, so we have to add
+      # the `r2` on our own.
+      platform, version, arch = platform_tag.split('-')
+      platform_tag = "#{platform}-#{version}r2-#{arch}"
+    end
+    tarball_name = runtime_prefix + platform_tag + runtime_suffix
+
+    on host, "curl -Of #{runtime_url}#{tarball_name}"
+
+    case host['platform']
+    when /windows/
+      on host, "gunzip -c #{tarball_name} | tar -k -C /cygdrive/c/ -xf -"
+
+      if arch == 'x64'
+        program_files = 'ProgramFiles64Folder'
+      else
+        program_files = 'ProgramFilesFolder'
+      end
+      if branch == '5.5.x'
+        bindir = "/cygdrive/c/#{program_files}/PuppetLabs/Puppet/sys/ruby/bin"
+      else
+        bindir = "/cygdrive/c/#{program_files}/PuppetLabs/Puppet/puppet/bin"
+      end
+      on host, "chmod 755 #{bindir}/*"
+
+      # Because the runtime archive for windows gets installed in a non-standard
+      # directory (ProgramFiles64Folder), we need to add it to the path here
+      # rather than rely on `host['privatebindir']` like we can for other
+      # platforms
+      host.add_env_var('PATH', bindir)
+    when /osx/
+      on host, "tar -xzf #{tarball_name}"
+      on host, "for d in opt var private; do rsync -ka \"${d}/\" \"/${d}/\"; done"
+    else
+      on host, "gunzip -c #{tarball_name} | #{tar} -k -C / -xf -"
+    end
   end
 end
 
-# Only configure gem mirror after Ruby has been installed, but before any gems are installed.
-configure_gem_mirror(hosts)
+step "Install bundler" do
+  # Only configure gem mirror after Ruby has been installed, but before any gems are installed.
+  configure_gem_mirror(agents)
 
-hosts.each do |host|
-  case host['platform']
-  when /solaris/
-    step "#{host} Install json from rubygems"
-    on host, 'gem install json_pure --no-ri --no-rdoc --version 1.8.3' # json_pure 2.0 requires ruby 2
-    on host, 'gem install bundler --no-ri --no-rdoc'
-    on host, "ln -sf /opt/csw/bin/bundle #{host['puppetbindir']}/bundle"
-  when /windows/
-    on host, 'cmd /c gem install bundler --no-ri --no-rdoc'
-  else
-    on host, 'gem install bundler --no-ri --no-rdoc'
+  agents.each do |host|
+    on host, "#{gem_command(host)} install bundler --no-ri --no-rdoc"
   end
 end

data/setup/git/010_TestSetup.rb

@@ -1,79 +1,60 @@
-test_name "Install packages and repositories on target machines..." do
+test_name "Install repositories on target machines..." do
+
   repositories = options[:install].map do |url|
     extract_repo_info_from(build_git_url(url))
   end
 
-  hosts.each_with_index do |host, index|
+  agents.each_with_index do |host, index|
     on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
 
     repositories.each do |repository|
       step "Install #{repository[:name]}"
-      if repository[:path] =~ /^file:\/\/(.+)$/
-        on host, "test -d #{SourcePath} || mkdir -p #{SourcePath}"
-        source_dir = $1
-        checkout_dir = "#{SourcePath}/#{repository[:name]}"
-        on host, "rm -f #{checkout_dir}" # just the symlink, do not rm -rf !
-        on host, "ln -s #{source_dir} #{checkout_dir}"
-        on host, "cd #{checkout_dir} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi"
-      else
-        puppet_dir = host.tmpdir('puppet')
-        on(host, "chmod 755 #{puppet_dir}")
+      repo_dir = host.tmpdir(repository[:name])
+      on(host, "chmod 755 #{repo_dir}")
+
+      gem_source = ENV["GEM_SOURCE"] || "https://rubygems.org"
 
+      case repository[:path]
+      when /^(git:|https:|git@)/
         sha = ENV['SHA'] || `git rev-parse HEAD`.chomp
-        gem_source = ENV["GEM_SOURCE"] || "https://rubygems.org"
-        gemfile_contents = <<END
+        gem_path = ":git => '#{repository[:path]}', :ref => '#{sha}'"
+      when /^file:\/\/(.*)/
+        gem_path = ":path => '#{$1}'"
+      else
+        gem_path = repository[:path]
+      end
+      create_remote_file(host, "#{repo_dir}/Gemfile", <<-END)
 source '#{gem_source}'
-gem '#{repository[:name]}', :git => '#{repository[:path]}', :ref => '#{sha}'
-END
-        case host['platform']
-        when /windows/
-          create_remote_file(host, "#{puppet_dir}/Gemfile", gemfile_contents)
-          # bundle must be passed a Windows style path for a binstubs location
-          bindir = host['puppetbindir'].split(':').first
-          binstubs_dir = on(host, "cygpath -m \"#{bindir}\"").stdout.chomp
-          # note passing --shebang to bundle is not useful because Cygwin
-          # already finds the Ruby interpreter OK with the standard shebang of:
-          # !/usr/bin/env ruby
-          # the problem is a Cygwin style path is passed to the interpreter and this can't be modified:
-          # http://cygwin.1069669.n5.nabble.com/Pass-windows-style-paths-to-the-interpreter-from-the-shebang-line-td43870.html
-          on host, "cd #{puppet_dir} && cmd.exe /c \"bundle install --system --binstubs '#{binstubs_dir}'\""
-          # puppet.bat isn't written by Bundler, but facter.bat is - copy this generic file
-          on host, "cd #{host['puppetbindir']} && test -f ./puppet.bat || cp ./facter.bat ./puppet.bat"
-          # to access gem / facter / puppet / bundle / irb with Cygwin generally requires aliases
-          # so that commands in /usr/bin are overridden and the binstub wrappers won't run inside Cygwin
-          # but rather will execute as batch files through cmd.exe
-          # without being overridden, Cygwin reads the shebang and causes errors like:
-          # C:\cygwin64\bin\ruby.exe: No such file or directory -- /usr/bin/puppet (LoadError)
-          # NOTE /usr/bin/puppet is a Cygwin style path that our custom Ruby build
-          # does not understand - it expects a standard Windows path like c:\cygwin64\bin\puppet
+gem '#{repository[:name]}', #{gem_path}
+      END
 
-          # a workaround in interactive SSH is to add aliases to local session / .bashrc:
-          #   on host, "echo \"alias puppet='C:/\\cygwin64/\\bin/\\puppet.bat'\" >> ~/.bashrc"
-          # note that this WILL NOT impact Beaker runs though
-          puppet_bundler_install_dir = on(host, "cd #{puppet_dir} && cmd.exe /c bundle show puppet").stdout.chomp
-        when /el-7/
-          create_remote_file(host, "#{puppet_dir}/Gemfile", gemfile_contents + "gem 'json'\n")
-          on host, "cd #{puppet_dir} && bundle install --system --binstubs #{host['puppetbindir']}"
-          puppet_bundler_install_dir = on(host, "cd #{puppet_dir} && bundle show puppet").stdout.chomp
-        when /solaris/
-          create_remote_file(host, "#{puppet_dir}/Gemfile", gemfile_contents)
-          on host, "cd #{puppet_dir} && bundle install --system --binstubs #{host['puppetbindir']} --shebang #{host['puppetbindir']}/ruby"
-          puppet_bundler_install_dir = on(host, "cd #{puppet_dir} && bundle show puppet").stdout.chomp
-        else
-          create_remote_file(host, "#{puppet_dir}/Gemfile", gemfile_contents)
-          on host, "cd #{puppet_dir} && bundle install --system --binstubs #{host['puppetbindir']}"
-          puppet_bundler_install_dir = on(host, "cd #{puppet_dir} && bundle show puppet").stdout.chomp
-        end
+      case host['platform']
+      when /windows/
+        # bundle must be passed a Windows style path for a binstubs location
+        bindir = host['puppetbindir'].split(':').first
+        binstubs_dir = on(host, "cygpath -m \"#{bindir}\"").stdout.chomp
+        # note passing --shebang to bundle is not useful because Cygwin
+        # already finds the Ruby interpreter OK with the standard shebang of:
+        # !/usr/bin/env ruby
+        # the problem is a Cygwin style path is passed to the interpreter and this can't be modified:
+        # http://cygwin.1069669.n5.nabble.com/Pass-windows-style-paths-to-the-interpreter-from-the-shebang-line-td43870.html
+        on host, "cd #{repo_dir} && #{bundle_command(host)} install --system --binstubs '#{binstubs_dir}'"
 
-        # install.rb should also be called from the Puppet gem install dir
-        # this is required for the puppetres.dll event log dll on Windows
-        on host, "cd #{puppet_bundler_install_dir} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi"
+        # bundler created but does not install batch files to the binstubs dir
+        # so we have to manually copy the batch files over
+        gemdir = on(host, "#{gem_command(host)} environment gemdir").stdout.chomp
+        gembindir = File.join(gemdir, 'bin')
+        on host, "cd '#{host['puppetbindir']}' && test -f ./#{repository[:name]}.bat || cp '#{gembindir}/#{repository[:name]}.bat' '#{host['puppetbindir']}/#{repository[:name]}.bat'"
+      else
+        on host, "cd #{repo_dir} && #{bundle_command(host)} install --system --binstubs #{host['puppetbindir']}"
       end
+      puppet_bundler_install_dir ||= on(host, "cd #{repo_dir} && #{bundle_command(host)} show #{repository[:name]}").stdout.chomp
+      host.add_env_var('RUBYLIB', File.join(puppet_bundler_install_dir, 'lib'))
     end
   end
 
   step "Hosts: create environments directory like AIO does" do
-    hosts.each do |host|
+    agents.each do |host|
       codedir = host.puppet['codedir']
       on host, "mkdir -p #{codedir}/environments/production/manifests"
       on host, "mkdir -p #{codedir}/environments/production/modules"

data/setup/git/020_PuppetUserAndGroup.rb

@@ -1,10 +1,7 @@
 test_name 'Puppet User and Group' do
   hosts.each do |host|
-
     step "ensure puppet user and group added to all nodes because this is what the packages do" do
       on host, puppet("resource user puppet ensure=present")
-      on host, puppet("resource group puppet ensure=present")
     end
-
   end
 end

data/tasks/ci.rake

@@ -110,6 +110,11 @@ $project_SERVER:
     Similar to SERVER, but project specific. If you have only one project (i.e., hiera) that you
     want to pull from a different server then all the others, you could set HIERA_SERVER=179.0.0.1,
     and you would get back 'https://179.0.0.1/puppetlabs-hiera.git'.
+
+RUNTIME_BRANCH:
+    Currently only used with git-based testing. This must correspond to a branch in the
+    puppet-agent repo. We use it to determine the tag of the agent-runtime package that
+    we want. We also use it to construct the agent-runtime archive name (ie agent-runtime-${branch}-${tag})
 EOS
 
 namespace :ci do
@@ -200,11 +205,15 @@ Run the acceptance tests against a git checkout.
 
   $ SHA=<full sha> bundle exec rake ci:test:git
 
-SHA should be the full SHA for the component. Other options:
+SHA: for git based testing specifically, this can be a sha, a branch, or a tag.
 
 FORK: to test against your fork, defaults to 'puppetlabs'
 
 SERVER: to git fetch from an alternate GIT server, defaults to 'github.com'
+
+RUNTIME_BRANCH: the branch of the agent-runtime package to grab, defaults to
+  'master'. This tells us which branch of puppet-agent to get the runtime tag
+  from and helps us create the archive name when we go to curl it down.
 EOS
     task :git => ['ci:check_env', 'ci:gen_hosts'] do
       beaker_suite(:git)
@@ -251,15 +260,15 @@ def pre_suites(type)
     [
       "#{beaker_root}/setup/common/000-delete-puppet-when-none.rb",
       "#{beaker_root}/setup/aio/010_Install_Puppet_Agent.rb",
-      "#{beaker_root}/setup/aio/011_Install_Puppet_Server.rb",
-      "#{beaker_root}/setup/aio/012_Finalize_Installs.rb",
-      "#{beaker_root}/setup/aio/020_InstallCumulusModules.rb",
-      "#{beaker_root}/setup/aio/021_InstallAristaModuleMasters.rb",
-      "#{beaker_root}/setup/aio/022_InstallAristaModuleAgents.rb",
+      "#{beaker_root}/setup/common/011_Install_Puppet_Server.rb",
+      "#{beaker_root}/setup/common/012_Finalize_Installs.rb",
+      "#{beaker_root}/setup/common/020_InstallCumulusModules.rb",
+      "#{beaker_root}/setup/common/021_InstallAristaModuleMasters.rb",
+      "#{beaker_root}/setup/common/022_InstallAristaModuleAgents.rb",
       "#{beaker_root}/setup/common/025_StopFirewall.rb",
       "#{beaker_root}/setup/common/030_StopSssd.rb",
       "#{beaker_root}/setup/common/040_ValidateSignCert.rb",
-      "#{beaker_root}/setup/aio/045_EnsureMasterStarted.rb",
+      "#{beaker_root}/setup/common/045_EnsureMasterStarted.rb",
     ]
   when :gem
     [
@@ -271,13 +280,13 @@ def pre_suites(type)
       "#{beaker_root}/setup/common/000-delete-puppet-when-none.rb",
       "#{beaker_root}/setup/git/000_EnvSetup.rb",
       "#{beaker_root}/setup/git/010_TestSetup.rb",
-      "#{beaker_root}/setup/git/011_SetMaster.rb",
+      "#{beaker_root}/setup/common/011_Install_Puppet_Server.rb",
       "#{beaker_root}/setup/git/020_PuppetUserAndGroup.rb",
+      "#{beaker_root}/setup/git/070_InstallCACerts.rb",
       "#{beaker_root}/setup/common/025_StopFirewall.rb",
-      "#{beaker_root}/setup/git/030_PuppetMasterSanity.rb",
+      "#{beaker_root}/setup/common/030_StopSssd.rb",
       "#{beaker_root}/setup/common/040_ValidateSignCert.rb",
-      "#{beaker_root}/setup/git/060_InstallModules.rb",
-      "#{beaker_root}/setup/git/070_InstallCACerts.rb",
+      "#{beaker_root}/setup/common/045_EnsureMasterStarted.rb",
     ]
   end
   presuites.join(',')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -271,22 +271,20 @@ files:
 - lib/beaker/dsl/install_utils/module_utils.rb
 - lib/beaker/dsl/install_utils/puppet_utils.rb
 - setup/aio/010_Install_Puppet_Agent.rb
-- setup/aio/011_Install_Puppet_Server.rb
-- setup/aio/012_Finalize_Installs.rb
-- setup/aio/020_InstallCumulusModules.rb
-- setup/aio/021_InstallAristaModuleMasters.rb
-- setup/aio/022_InstallAristaModuleAgents.rb
-- setup/aio/045_EnsureMasterStarted.rb
 - setup/common/000-delete-puppet-when-none.rb
+- setup/common/011_Install_Puppet_Server.rb
+- setup/common/012_Finalize_Installs.rb
+- setup/common/020_InstallCumulusModules.rb
+- setup/common/021_InstallAristaModuleMasters.rb
+- setup/common/022_InstallAristaModuleAgents.rb
 - setup/common/025_StopFirewall.rb
 - setup/common/030_StopSssd.rb
 - setup/common/040_ValidateSignCert.rb
+- setup/common/045_EnsureMasterStarted.rb
 - setup/gem/010_GemInstall.rb
 - setup/git/000_EnvSetup.rb
 - setup/git/010_TestSetup.rb
-- setup/git/011_SetMaster.rb
 - setup/git/020_PuppetUserAndGroup.rb
-- setup/git/030_PuppetMasterSanity.rb
 - setup/git/060_InstallModules.rb
 - setup/git/070_InstallCACerts.rb
 - spec/beaker-puppet/helpers/facter_helpers_spec.rb

data/setup/git/011_SetMaster.rb

@@ -1,15 +0,0 @@
-test_name 'Hosts: create basic puppet.conf' do
-  skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
-  hosts.each do |host|
-    confdir = host.puppet['confdir']
-    on host, "mkdir -p #{confdir}"
-    puppetconf = File.join(confdir, 'puppet.conf')
-
-    if host['roles'].include?('agent')
-      on host, "echo '[agent]' > '#{puppetconf}' && " +
-               "echo server=#{master} >> '#{puppetconf}'"
-    else
-      on host, "touch '#{puppetconf}'"
-    end
-  end
-end

data/setup/git/030_PuppetMasterSanity.rb

@@ -1,20 +0,0 @@
-test_name "Puppet Master sanity checks: PID file and SSL dir creation"
-
-skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
-
-hostname = on(master, 'facter hostname').stdout.strip
-fqdn = on(master, 'facter fqdn').stdout.strip
-
-with_puppet_running_on(master, :main => { :dns_alt_names => "puppet,#{hostname},#{fqdn}", :verbose => true, :noop => true }) do
-  # SSL dir created?
-  step "SSL dir created?"
-  on master,  "[ -d #{master.puppet('master')['ssldir']} ]"
-
-  # PID file exists?
-  step "PID file created?"
-  on master, "[ -f #{master.puppet('master')['pidfile']} ]"
-end
-
-step "Create module directories normally handled via packaging"
-on master, "mkdir -p #{master['distmoduledir']}"
-on master, "mkdir -p #{master['sitemoduledir']}"