Gemfile

@@ -10,24 +10,9 @@ group :test do
   gem "puppetlabs_spec_helper"
   gem "metadata-json-lint"
   gem "rspec-puppet-facts"
-  gem 'webmock'
-  gem 'rubocop', '0.33.0'
+  gem 'rubocop', '0.42.0'
   gem 'simplecov', '>= 0.11.0'
   gem 'simplecov-console'
-
-  gem "puppet-lint-absolute_classname-check"
-  gem "puppet-lint-leading_zero-check"
-  gem "puppet-lint-trailing_comma-check"
-  gem "puppet-lint-version_comparison-check"
-  gem "puppet-lint-classes_and_types_beginning_with_digits-check"
-  gem "puppet-lint-unquoted_string-check"
-  gem 'puppet-lint-resource_reference_syntax'
-end
-
-group :development do
-  gem "vagrant-wrapper"
-  gem "puppet-blacksmith"
-  gem "guard-rake"
 end
 
 if File.exists? "#{__FILE__}.local"

Rakefile

@@ -9,13 +9,6 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'metadata-json-lint/rake_task'
 require 'rubocop/rake_task'
 
-# These gems aren't always present, for instance
-# on Travis with --without development
-begin
-  require 'puppet_blacksmith/rake_tasks'
-rescue LoadError
-end
-
 # Coverage from puppetlabs-spec-helper requires rcov which
 # doesn't work in anything since 1.8.7
 Rake::Task[:coverage].clear

files/puppet-enterprise-support

@@ -842,13 +842,33 @@ module_listing() {
   fi
 }
 
-# Check r10k version
+# Check r10k version and deployment status
+#
+# Global Variables Used:
+#   PUPPET_BIN_DIR
+#
+# Arguments:
+#   None
+#
+# Returns:
+#   None
 check_r10k() {
-  if [ -x "${PUPPET_BIN_DIR?}/gem" ]; then
-    run_diagnostic "${PUPPET_BIN_DIR?}/gem list | $PLATFORM_EGREP r10k" "enterprise/r10k_gem_version.txt"
+  local r10k_config=""
+
+  if [[ -x "${PUPPET_BIN_DIR?}/gem" ]]; then
+    run_diagnostic "${PUPPET_BIN_DIR}/gem list r10k" "enterprise/r10k_gem_version.txt"
   fi
-  if [ -x "${PUPPET_BIN_DIR}/r10k" ] && [ -e /etc/puppetlabs/r10k/r10k.yaml ]; then
-    run_diagnostic "${PUPPET_BIN_DIR}/r10k deploy display -p --detail" "enterprise/r10k_deploy_display.txt"
+
+  if [[ -e /opt/puppetlabs/server/data/code-manager/r10k.yaml ]]; then
+    # Code Manager
+    r10k_config=/opt/puppetlabs/server/data/code-manager/r10k.yaml
+  elif [[ -e /etc/puppetlabs/r10k/r10k.yaml ]]; then
+    # Custom r10k config
+    r10k_config=/etc/puppetlabs/r10k/r10k.yaml
+  fi
+
+  if [[ -x "${PUPPET_BIN_DIR}/r10k" ]] && [[ -n "${r10k_config}" ]]; then
+    run_diagnostic "${PUPPET_BIN_DIR}/r10k deploy display -p --detail -c ${r10k_config}" "enterprise/r10k_deploy_display.txt"
   fi
 }
 
@@ -922,6 +942,40 @@ console_status() {
   run_diagnostic "${PUPPET_BIN_DIR}/curl --silent --show-error --connect-timeout 5 --max-time 60 http://127.0.0.1:4432/status/v1/services?level=debug" "enterprise/console_status.json"
 }
 
+# Collects output from the Puppet Server status endpoint
+#
+# Global Variables Used:
+#   PUPPET_BIN_DIR
+#
+# Arguments:
+#   None
+#
+# Returns:
+#   None
+puppetserver_status() {
+  run_diagnostic "${PUPPET_BIN_DIR}/curl --silent --show-error --connect-timeout 5 --max-time 60 -k https://127.0.0.1:8140/status/v1/services?level=debug" "enterprise/puppetserver_status.json"
+}
+
+# Collects output from the Puppet Server environments endpoint
+#
+# Global Variables Used:
+#   PUPPET_BIN_DIR
+#
+# Arguments:
+#   None
+#
+# Returns:
+#   None
+puppetserver_environments() {
+  local agent_cert
+  local agent_key
+
+  agent_cert=$(${PUPPET_BIN_DIR}/puppet config print --section agent hostcert)
+  agent_key=$(${PUPPET_BIN_DIR}/puppet config print --section agent hostprivkey)
+
+  run_diagnostic "${PUPPET_BIN_DIR}/curl --silent --show-error --connect-timeout 5 --max-time 60 --cert ${agent_cert} --key ${agent_key} -k https://127.0.0.1:8140/puppet/v3/environments" "enterprise/puppetserver_environments.json"
+}
+
 get_rbac_directory_settings_info() {
     local t_rbac_info_query="SELECT row_to_json(row) FROM ( SELECT \
 id, display_name, help_link, type, hostname, port, ssl, login, \
@@ -1050,6 +1104,8 @@ check_r10k
 mco_commands
 activemq_limits
 console_status
+puppetserver_status
+puppetserver_environments
 get_rbac_directory_settings_info
 filesync_state
 get_puppetdb_summary_stats

tests/beaker/tests/stub.rb

@@ -0,0 +1,4 @@
+test_name 'stubbed test for acceptance'
+
+# This test should be removed whence some actual acceptance tests are added
+