.gitignore

@@ -7,6 +7,7 @@
 /.bundle
 /vendor
 /Gemfile.lock
+/Gemfile.local
 /junit
 /log
 .yardoc

CHANGELOG.md

@@ -0,0 +1,25 @@
+## Release 1.0.0
+
+### Summary
+
+First major release of the Support Script as a stand-alone module. This version
+was bundled with PE 2016.2.0 with support for diagnosing PE infrastructure
+installations, not agents.
+
+### Features
+  - Support Script extracted from the legacy PE installer repository and
+    available as a stand-alone module. Script functionality is accessed through
+    a new Puppet subcommand: `puppet enterprise support`
+
+  - Support script archives now include the platform hostname and archive
+    datestamps are in UTC. A `metadata.json` file has been added to enable
+    automated parsing of support script contents.
+
+  - The scope of configuration files gathered from `/etc/puppetlabs` has been
+    clearly defined and sanitization of sensitive data has been improved.
+
+  - Multiple small cleanups of diagnostic functions.
+
+### Bug Fixes
+  - Console status check timeout has been increased from 5 seconds to 60
+    seconds.

Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 group :test do
   gem "rake"
   gem "beaker"
+  gem "beaker-pe", '>= 0.4.0'
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.1'
   gem "rspec", '< 3.2.0'
   gem "rspec-puppet", '~> 2.0'

files/puppet-enterprise-support

@@ -1067,7 +1067,7 @@ display_newline
 display "Support data is located at ${support_archive?}.gz"
 display_newline
 display "Current Puppet Enterprise customers:"
-display "Please submit ${support_archive?}.gz to Puppet Support at the Box upload site you've been invited to."
+display "Please submit ${support_archive?}.gz to Puppet Support using the upload site you've been invited to."
 display_newline
 display_newline
 

tests/beaker/pre-suite/01_module_install.rb

@@ -2,21 +2,6 @@
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../'))
   meep_module_dir = '/opt/puppetlabs/server/data/enterprise/modules'
 
-  # NOTE: This step is a temporary workaround for MEEP installation not being
-  # supported by beaker-pe yet and can be removed once MEEP support is merged.
-  step 'Mock MEEP' do
-    hosts.each do |host|
-      installer_dir = "#{host['working_dir']}/#{host['dist']}"
-
-      on(host, "mkdir -p #{meep_module_dir}")
-      on(host, puppet("module install #{installer_dir}/modules/*pe_manager*",
-        modulepath: meep_module_dir))
-
-      # Remove legacy PE support script.
-      on(host, 'rm -rf /opt/puppetlabs/bin/puppet-enterprise-support /opt/puppetlabs/server/share/installer/utilities')
-    end
-  end
-
   step 'Install pe_support_script Module' do
     # Ensure any module packaged with the installer is removed.
     on(hosts, "rm -rf #{meep_module_dir}/pe_support_script")

tests/beaker/pre-suite/02_run_support_script.rb

@@ -1,10 +1,7 @@
 test_name 'PE-15434 - - Run Support Script' do
-  # NOTE: This can be removed once PE-15117 lands.
-  meep_module_dir = '/opt/puppetlabs/server/data/enterprise/modules'
-
   step 'Run Support Script' do
     hosts.each do |host|
-      result = on(host, puppet('enterprise support', modulepath: meep_module_dir))
+      result = on(host, puppet('enterprise support'))
       output_tarball = result.stdout.match(/^Support data is located at (.*)$/).captures.first
 
       stage_dir = create_tmpdir_on(host)