beaker-puppet 1.29.0 → 2.0.0

data/setup/common/003_solaris_cert_fix.rb

@@ -1,84 +1,87 @@
 test_name 'Add digicert to solaris keystore'
 
 # Only need to run this on soliars 11, 11.2, and sparc
-skip_test 'No solaris 11 version that needed keystore updating' if ! hosts.any? { |host| host.platform=~ /solaris-11(\.2)?-(i386|sparc)/}
+skip_test 'No solaris 11 version that needed keystore updating' unless hosts.any? do |host|
+  host.platform =~ /solaris-11(\.2)?-(i386|sparc)/
+end
 
-DigiCert = <<-EOM
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
-RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
-Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
-ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
-xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
-ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
-DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
-jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
-CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
-EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
-fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
-uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
-chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
-9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
-SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
-+SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
-fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
-sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
-cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
-0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
-4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
-r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
-/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
-gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
------END CERTIFICATE-----
+DigiCert = <<~EOM
+  -----BEGIN CERTIFICATE-----
+  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
+  -----END CERTIFICATE-----
 EOM
 
-USERTrust = <<-EOM
------BEGIN CERTIFICATE-----
-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
-Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----
+USERTrust = <<~EOM
+  -----BEGIN CERTIFICATE-----
+  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
+  Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+  -----END CERTIFICATE-----
 EOM
 
 hosts.each do |host|
-  next unless host.platform =~ /solaris-11(\.2)?-(i386|sparc)/ 
-  create_remote_file(host, "DigiCert_Trusted_Root_G4.pem", DigiCert)
+  next unless host.platform =~ /solaris-11(\.2)?-(i386|sparc)/
+
+  create_remote_file(host, 'DigiCert_Trusted_Root_G4.pem', DigiCert)
   on(host, 'chmod a+r /root/DigiCert_Trusted_Root_G4.pem')
   on(host, 'cp -p /root/DigiCert_Trusted_Root_G4.pem /etc/certs/CA/')
   on(host, 'rm /root/DigiCert_Trusted_Root_G4.pem')
 
-  if host.platform=~ /solaris-11-sparc/
-    create_remote_file(host, "USERTrust_RSA_Certification_Authority.pem", USERTrust)
+  if host.platform =~ /solaris-11-sparc/
+    create_remote_file(host, 'USERTrust_RSA_Certification_Authority.pem', USERTrust)
     on(host, 'chmod a+r /root/USERTrust_RSA_Certification_Authority.pem')
     on(host, 'cp -p /root/USERTrust_RSA_Certification_Authority.pem /etc/certs/CA/')
     on(host, 'rm /root/USERTrust_RSA_Certification_Authority.pem')
@@ -87,9 +90,10 @@ hosts.each do |host|
   on(host, '/usr/sbin/svcadm restart /system/ca-certificates')
   timeout = 60
   counter = 0
-  while on(host, 'svcs -x ca-certificates').output !~ /State: online/ do
+  while on(host, 'svcs -x ca-certificates').output !~ /State: online/
     raise 'ca-certificates services failed start up' if counter > timeout
+
     sleep 5
-    counter = counter + 5
+    counter += 5
   end
 end

data/setup/common/005_redhat_subscription_fix.rb

@@ -1,10 +1,11 @@
 test_name 'Refresh Red Hat 8 subscription repository'
 
 # Only need to run this on Red Hat Enterprise Linux 8 on little-endian PowerPC
-skip_test 'Not Red Hat 8 PPCle' if ! hosts.any? { |host| host.platform == 'el-8-ppc64le' }
+skip_test 'Not Red Hat 8 PPCle' unless hosts.any? { |host| host.platform == 'el-8-ppc64le' }
 
 hosts.each do |host|
   next unless host.platform == 'el-8-ppc64le'
 
-  on(host, '/usr/sbin/subscription-manager repos --disable rhel-8-for-ppc64le-baseos-rpms && /usr/sbin/subscription-manager repos --enable rhel-8-for-ppc64le-baseos-rpms')
+  on(host,
+     '/usr/sbin/subscription-manager repos --disable rhel-8-for-ppc64le-baseos-rpms && /usr/sbin/subscription-manager repos --enable rhel-8-for-ppc64le-baseos-rpms')
 end

data/setup/common/011_Install_Puppet_Server.rb

@@ -1,13 +1,11 @@
-test_name "Install Puppet Server" do
-  skip_test "not testing with puppetserver" unless @options['is_puppetserver']
+test_name 'Install Puppet Server' do
+  skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
 
   opts = {
-    :version => ENV['SERVER_VERSION'],
-    :release_stream => ENV['RELEASE_STREAM'],
-    :nightly_builds_url => ENV['NIGHTLY_BUILDS_URL'],
-    :dev_builds_url => ENV['DEV_BUILDS_URL']
+    version: ENV.fetch('SERVER_VERSION', nil),
+    release_stream: ENV.fetch('RELEASE_STREAM', nil),
+    nightly_builds_url: ENV.fetch('NIGHTLY_BUILDS_URL', nil),
+    dev_builds_url: ENV.fetch('DEV_BUILDS_URL', nil),
   }
-  unless master['use_existing_container']
-    install_puppetserver_on(master, opts)
-  end
+  install_puppetserver_on(master, opts) unless master['use_existing_container']
 end

data/setup/common/012_Finalize_Installs.rb

@@ -1,6 +1,6 @@
-test_name "Finalize Host Installation"
+test_name 'Finalize Host Installation'
 
-step "Verify host times" do
+step 'Verify host times' do
   # Get a rough estimate of clock skew among hosts
   times = []
   hosts.each do |host|
@@ -10,16 +10,16 @@ step "Verify host times" do
     end
   end
   times.map! do |time|
-    (Time.strptime(time, "%Y-%m-%d %T.%L %z").to_f * 1000.0).to_i
+    (Time.strptime(time, '%Y-%m-%d %T.%L %z').to_f * 1000.0).to_i
   end
   diff = times.max - times.min
-  if diff < 60000
+  if diff < 60_000
     logger.info "Host times vary #{diff} ms"
   else
     logger.warn "Host times vary #{diff} ms, tests may fail"
   end
 end
 
-step "Configure gem mirror" do
+step 'Configure gem mirror' do
   configure_gem_mirror(hosts)
 end

data/setup/common/025_StopFirewall.rb

@@ -1,4 +1,4 @@
-test_name "Stop firewall" do
+test_name 'Stop firewall' do
   skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
   stop_firewall_with_puppet_on(hosts)
 end

data/setup/common/030_StopSssd.rb

@@ -1,9 +1,9 @@
-test_name "Stop sssd" do
+test_name 'Stop sssd' do
   # The sssd service causes local users/groups to be cached,
   # which can cause unexpected results when tests are trying
   # to restore state. We ensure that it is not running to
   # prevent such caching from occurring.
   hosts.each do |host|
-    on(host, puppet('resource', 'service', 'sssd', 'ensure=stopped'), :accept_all_exit_codes => true)
+    on(host, puppet('resource', 'service', 'sssd', 'ensure=stopped'), accept_all_exit_codes: true)
   end
 end

data/setup/common/040_ValidateSignCert.rb

@@ -1,4 +1,4 @@
-test_name "Validate Sign Cert" do
+test_name 'Validate Sign Cert' do
   need_to_run = false
   hosts.each do |host|
     need_to_run ||= !host['use_existing_container']
@@ -7,17 +7,17 @@ test_name "Validate Sign Cert" do
   skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
   hostname = on(master, 'facter hostname').stdout.strip
   fqdn = on(master, 'facter fqdn').stdout.strip
-  puppet_version = on(master, puppet("--version")).stdout.chomp
+  puppet_version = on(master, puppet('--version')).stdout.chomp
 
   if master.use_service_scripts?
-    step "Ensure puppet is stopped"
+    step 'Ensure puppet is stopped'
     # Passenger, in particular, must be shutdown for the cert setup steps to work,
     # but any running puppet master will interfere with webrick starting up and
     # potentially ignore the puppet.conf changes.
-    on(master, puppet('resource', 'service', master['puppetservice'], "ensure=stopped"))
+    on(master, puppet('resource', 'service', master['puppetservice'], 'ensure=stopped'))
   end
 
-  step "Clear SSL on all hosts"
+  step 'Clear SSL on all hosts'
   hosts.each do |host|
     ssldir = on(host, puppet('agent --configprint ssldir')).stdout.chomp
     # preserve permissions for master's ssldir so puppetserver can read it
@@ -29,22 +29,20 @@ test_name "Validate Sign Cert" do
     on(host, puppet("config set server #{master.hostname} --section main"))
   end
 
-  step "Start puppetserver" do
+  step 'Start puppetserver' do
     master_opts = {
       main: {
         dns_alt_names: "puppet,#{hostname},#{fqdn}",
         server: fqdn,
-        autosign: true
+        autosign: true,
       },
     }
 
     # In Puppet 6, we want to be using an intermediate CA
-    unless version_is_less(puppet_version, "5.99")
-      on master, 'puppetserver ca setup' unless master['use_existing_container']
-    end
+    on master, 'puppetserver ca setup' if !version_is_less(puppet_version, '5.99') && !master['use_existing_container']
     with_puppet_running_on(master, master_opts) do
-      step "Agents: Run agent --test with autosigning enabled to get cert"
-      on agents, puppet("agent --test"), :acceptable_exit_codes => [0,2]
+      step 'Agents: Run agent --test with autosigning enabled to get cert'
+      on agents, puppet('agent --test'), acceptable_exit_codes: [0, 2]
     end
   end
 end

data/setup/common/045_EnsureMasterStarted.rb

@@ -1,4 +1,4 @@
-test_name "Ensure the master is running"
+test_name 'Ensure the master is running'
 skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
 
-on(master, puppet('resource', 'service', master['puppetservice'], "ensure=running", "enable=true"))
+on(master, puppet('resource', 'service', master['puppetservice'], 'ensure=running', 'enable=true'))

data/setup/gem/010_GemInstall.rb

@@ -1,7 +1,7 @@
-test_name "Install puppet gem"
+test_name 'Install puppet gem'
 
 agents.each do |agent|
-  sha = ENV['SHA']
+  sha = ENV.fetch('SHA', nil)
   base_url = "http://builds.delivery.puppetlabs.net/puppet/#{sha}/artifacts"
 
   ruby_command = ruby_command(agent)
@@ -10,7 +10,8 @@ agents.each do |agent|
   # retrieve the build data, since the gem version is based on the short git
   # describe, not the full git SHA
   on(agent, "curl -s -o build_data.yaml #{base_url}/#{sha}.yaml")
-  gem_version = on(agent, "#{ruby_command} -ryaml -e 'puts YAML.load_file(\"build_data.yaml\")[:gemversion]'").stdout.chomp
+  gem_version = on(agent,
+                   "#{ruby_command} -ryaml -e 'puts YAML.load_file(\"build_data.yaml\")[:gemversion]'").stdout.chomp
 
   if agent['platform'] =~ /windows/
     # wipe existing gems first
@@ -27,7 +28,7 @@ agents.each do |agent|
   step "Download puppet gem from #{url}"
   on(agent, "curl -s -o puppet.gem #{url}")
 
-  step "Install puppet.gem"
+  step 'Install puppet.gem'
   on(agent, "#{gem_command} install puppet.gem")
 
   step "Verify it's sane"

data/setup/git/000_EnvSetup.rb

@@ -1,4 +1,4 @@
-test_name "Setup environment"
+test_name 'Setup environment'
 
 require 'json'
 require 'open-uri'
@@ -8,19 +8,19 @@ step 'Configure paths' do
   add_puppet_paths_on(hosts)
 end
 
-step "Install git and tar"
+step 'Install git and tar'
 PACKAGES = {
-  :redhat => ['git'],
-  :debian => [
-    ['git', 'git-core'],
+  redhat: ['git'],
+  debian: [
+    %w[git git-core],
   ],
-  :solaris_10 => [
-    'coreutils',
-    'git',
-    'gtar',
+  solaris_10: %w[
+    coreutils
+    git
+    gtar
   ],
-  :windows => ['git'],
-  :sles => ['git'],
+  windows: ['git'],
+  sles: ['git'],
 }
 
 # We need to be able override which tar we use on solaris, which we call later
@@ -38,28 +38,28 @@ agents.each do |host|
       # 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
-# Do not bother checking for partially installed packages
-partial=nocheck
-# Do not bother checking the runlevel
-runlevel=nocheck
-# Do not bother checking package dependencies (We take care of this)
-idepend=nocheck
-rdepend=nocheck
-# DO check for available free space and abort if there isn't enough
-space=quit
-# Do not check for setuid files.
-setuid=nocheck
-# Do not check if files conflict with other packages
-conflict=nocheck
-# We have no action scripts.  Do not check for them.
-action=nocheck
-# Install to the default base directory.
-basedir=default
-        END
+      create_remote_file host, '/root/shutupsolaris', <<~END
+        mail=
+        # Overwrite already installed instances
+        instance=overwrite
+        # Do not bother checking for partially installed packages
+        partial=nocheck
+        # Do not bother checking the runlevel
+        runlevel=nocheck
+        # Do not bother checking package dependencies (We take care of this)
+        idepend=nocheck
+        rdepend=nocheck
+        # DO check for available free space and abort if there isn't enough
+        space=quit
+        # Do not check for setuid files.
+        setuid=nocheck
+        # Do not check if files conflict with other packages
+        conflict=nocheck
+        # We have no action scripts.  Do not check for them.
+        action=nocheck
+        # Install to the default base directory.
+        basedir=default
+      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'
@@ -69,9 +69,9 @@ basedir=default
   end
 end
 
-install_packages_on(agents, PACKAGES, :check_if_exists => true)
+install_packages_on(agents, PACKAGES, check_if_exists: true)
 
-step "Unpack puppet-runtime" do
+step 'Unpack puppet-runtime' do
   need_to_run = false
   agents.each do |host|
     # we only need to unpack the runtime if the host doesn't already have runtime
@@ -92,7 +92,7 @@ step "Unpack puppet-runtime" do
     runtime_url = "#{dev_builds_url}/puppet-runtime/#{runtime_tag}/artifacts/"
 
     runtime_prefix = "agent-runtime-#{branch}-#{runtime_tag}."
-    runtime_suffix = ".tar.gz"
+    runtime_suffix = '.tar.gz'
 
     agents.each do |host|
       next if host['has_runtime'] || host['use_existing_container']
@@ -113,16 +113,16 @@ step "Unpack puppet-runtime" do
       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
+        program_files = if arch == 'x64'
+                          'ProgramFiles64Folder'
+                        else
+                          'ProgramFilesFolder'
+                        end
+        bindir = if branch == '5.5.x'
+                   "/cygdrive/c/#{program_files}/PuppetLabs/Puppet/sys/ruby/bin"
+                 else
+                   "/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
@@ -132,7 +132,7 @@ step "Unpack puppet-runtime" do
         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"
+        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
@@ -140,7 +140,7 @@ step "Unpack puppet-runtime" do
   end
 end
 
-step "Install bundler" do
+step 'Install bundler' do
   # Only configure gem mirror after Ruby has been installed, but before any gems are installed.
   configure_gem_mirror(agents)
 

data/setup/git/010_TestSetup.rb

@@ -1,5 +1,4 @@
-test_name "Install 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
@@ -29,20 +28,20 @@ test_name "Install repositories on target machines..." do
       repo_dir = host.tmpdir(repository[:name])
       on(host, "chmod 755 #{repo_dir}")
 
-      gem_source = ENV["GEM_SOURCE"] || "https://rubygems.org"
+      gem_source = ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
       case repository[:path]
       when /^(git:|https:|git@)/
         sha = ENV['SHA'] || `git rev-parse HEAD`.chomp
         gem_path = ":git => '#{repository[:path]}', :ref => '#{sha}'"
-      when /^file:\/\/(.*)/
-        gem_path = ":path => '#{$1}'"
+      when %r{^file://(.*)}
+        gem_path = ":path => '#{Regexp.last_match(1)}'"
       else
         gem_path = repository[:path]
       end
-      create_remote_file(host, "#{repo_dir}/Gemfile", <<-END)
-source '#{gem_source}'
-gem '#{repository[:name]}', #{gem_path}
+      create_remote_file(host, "#{repo_dir}/Gemfile", <<~END)
+        source '#{gem_source}'
+        gem '#{repository[:name]}', #{gem_path}
       END
 
       case host['platform']
@@ -50,7 +49,7 @@ gem '#{repository[:name]}', #{gem_path}
         # 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
+        # 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:
@@ -61,16 +60,18 @@ gem '#{repository[:name]}', #{gem_path}
         # 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'"
+        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
+      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
+  step 'Hosts: create environments directory like AIO does' do
     agents.each do |host|
       codedir = host.puppet['codedir']
       on host, "mkdir -p #{codedir}/environments/production/manifests"

data/setup/git/020_PuppetUserAndGroup.rb

@@ -1,8 +1,9 @@
 test_name 'Puppet User and Group' do
   hosts.each do |host|
     next if host['use_existing_container']
-    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")
+
+    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')
     end
   end
 end