(maint) Merge up 8b5d99d to 6.0.x

Generated by CI

* commit '8b5d99d9b0c1a2b1c929ed337df284eee183ce95': (22 commits)
  (maint) Update facter to 9d1c2f84a769b532c7b6c73dddd0d56ae853b5e7
  (maint) Update puppet to 3bf8d22a79b556f0534400bf31965adc073438f9
  (maint) Update puppet to 47fe6d5561f10f0df98cd75d8908d961add53597
  (maint) Fix sysv-wrapper.sh to work with Solaris 10
  (maint) Update puppet to e26236c508ba67f8a391fd97b6002bb5b5988ab7
  (maint) Update puppet to 4562a0031870d2f6a041e963742414dc691fe5b9
  (maint) Update puppet to 5a30328af36b66fe5bd1fbfdff4c129222b6b603
  (PUP-8351) Update bash wrappers to keep LD_LIBRARY_PATH with RHSCL
  (maint) Update puppet to b7937ba55303db08ed29d5c56488c52553a14444
  (maint) Add helper functions for release lead work
  (maint) Update puppet to 5327edb5d09f9f6a22abd2aeba6da86564b5d985
  (PA-2129) Include the eyaml executable in the bin directory
  (maint) Update puppet to 04b258083af8e410758489d8b046bb754c975496
  (maint) Move windows eventlog test out of puppet
  (maint) Update facter to 23244f9f54d44abf46bf184041524d8b2b8d2b58
  (maint) Update facter to 0daa072c0e68cfc3693370d9ff600e7ca0fa4ec1
  (maint) Update puppet to f1f7b2322dc2f9b58b3315f3833d484a09981348
  (maint) Update puppet to 1c98a77933feac6c3d39483a7a80df2aa6388375
  (maint) Update puppet-runtime to 201810110
  (maint) Update leatherman to refs/tags/1.4.4
  ...

acceptance/tests/ensure_SCL_python_pip_works.rb

@@ -0,0 +1,18 @@
+test_name 'PUP-8351: Ensure pip provider works with RHSCL python' do
+  confine :to, :platform => /centos-(6|7)/
+  tag 'audit:medium',
+      'audit:acceptance'
+
+  teardown do
+      on agent, 'yum remove python27-python-pip -y'
+  end
+
+  step 'install and enable RHSCL python' do
+    on agent, 'yum install centos-release-scl -y'
+    on agent, 'yum install python27-python-pip -y'
+  end
+
+  step 'With with the SCL python enabled: Attempt \'resource package\' with a python package and the pip provider' do
+    on(agent, 'source /opt/rh/python27/enable && puppet resource package vulture ensure=present provider=\'pip\'')
+  end
+end

acceptance/tests/windows_eventlog.rb

@@ -0,0 +1,35 @@
+test_name "Write to Windows eventlog"
+
+tag 'audit:medium',    # core feature, high impact, but low risk
+    'audit:refactor',  # Use block style `test_name`
+    'audit:acceptance' # unclear if this is an important packaging level feature
+                       # test (warrants acceptance level) that wouldn't also be
+                       # caught by other test (perhaps combine with other tests),
+                       # or if the functionality is assumed by other acceptance tests
+                       # (then this test can be deleted), or if packaging can be
+                       # assumed and the logging functionality can be tested at the
+                       # integration level.
+
+confine :to, :platform => 'windows'
+
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CommandUtils
+
+agents.each do |agent|
+  # get remote time
+  # https://msdn.microsoft.com/en-us/library/aa394226(v=vs.85).aspx
+  # set Microsecond and time zone offset both to 0
+  now = on(agent, "#{ruby_command(agent)} -e \"puts Time.now.utc.strftime('%Y%m%d%H%M%S.000000-000')\"").stdout.chomp
+
+  # generate an error, no master on windows boxes
+  # we use `agent` because it creates an eventlog log destination by default,
+  # whereas `apply` does not.
+  on agent, puppet('agent', '--server', '127.0.0.1', '--test'), :acceptable_exit_codes => [1]
+
+  # make sure there's a Puppet error message in the log
+  # cygwin + ssh + wmic hangs trying to read stdin, so echo '' |
+  on agent, "cmd /c echo '' | wmic ntevent where \"LogFile='Application' and SourceName='Puppet' and TimeWritten >= '#{now}'\"  get Message,Type /format:csv" do
+    fail_test "Event not found in Application event log" unless
+      stdout.include?('target machine actively refused it. - connect(2) for "127.0.0.1"')
+  end
+end

configs/components/puppet.rb

@@ -179,6 +179,11 @@
     end
   end
 
+  unless platform.is_windows?
+    # Include the eyaml executable
+    pkg.link "#{settings[:puppet_gem_vendor_dir]}/bin/eyaml", "#{settings[:bindir]}/eyaml"
+  end
+
   #The following will add the vim syntax files for puppet
   #in the /opt/puppetlabs/puppet/share/vim directory
   pkg.add_source "file://resources/files/ftdetect/ftdetect_puppet.vim", sum: "9e93cd63787de6b9ed458c95061f06eb"

resources/files/sysv-wrapper.sh

@@ -1,6 +1,14 @@
 #!/bin/sh
 
-unset LD_LIBRARY_PATH
+# We keep around any paths in LD_LIBRARY_PATH that start with /opt/rh/. Those paths are
+# from redhat software collections packages and are required for things like SCL python
+# to work. See PUP-8351.
+STRIP_LDLYP_COMMAND=" \
+if ENV['LD_LIBRARY_PATH']; \
+  print ENV['LD_LIBRARY_PATH'].split(':', -1).keep_if { |path| path.start_with?('/opt/rh/') }.join(':') \
+end"
+LD_LIBRARY_PATH=`/opt/puppetlabs/puppet/bin/ruby -e "$STRIP_LDLYP_COMMAND"`
+export LD_LIBRARY_PATH
 unset LD_PRELOAD
 
 COMMAND=`basename "${0}"`