.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       puppet_major_versions: ${{ steps.get_outputs.outputs.puppet_major_versions }}
       puppet_unit_test_matrix: ${{ steps.get_outputs.outputs.puppet_unit_test_matrix }}
     env:
-      BUNDLE_WITHOUT: development:release
+      BUNDLE_WITHOUT: development:system_tests:release
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [18.1.0](https://github.com/theforeman/puppet-foreman/tree/18.1.0) (2021-08-04)
+
+[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/18.0.0...18.1.0)
+
+**Implemented enhancements:**
+
+- Add hammer plugin for foreman\_puppet [\#979](https://github.com/theforeman/puppet-foreman/pull/979) ([amirfefer](https://github.com/amirfefer))
+- Add hammer plugin for foreman\_webhooks [\#977](https://github.com/theforeman/puppet-foreman/pull/977) ([ofedoren](https://github.com/ofedoren))
+
 ## [18.0.0](https://github.com/theforeman/puppet-foreman/tree/18.0.0) (2021-07-26)
 
 [Full Changelog](https://github.com/theforeman/puppet-foreman/compare/17.0.0...18.0.0)
@@ -12,7 +21,9 @@
 
 **Implemented enhancements:**
 
+- Let Function to\_symbolized\_yaml handle Datatype Sensitive [\#972](https://github.com/theforeman/puppet-foreman/pull/972) ([cocker-cc](https://github.com/cocker-cc))
 - Match Foreman user to what packaging creates [\#971](https://github.com/theforeman/puppet-foreman/pull/971) ([ekohl](https://github.com/ekohl))
+- Handle duplicate file declaration for foreman::app\_root [\#969](https://github.com/theforeman/puppet-foreman/pull/969) ([chr1s692](https://github.com/chr1s692))
 - Fixes [\#32947](https://projects.theforeman.org/issues/32947) - Use Apache module variables [\#968](https://github.com/theforeman/puppet-foreman/pull/968) ([ekohl](https://github.com/ekohl))
 - Fixes [\#32352](https://projects.theforeman.org/issues/32352) - use mod\_auth\_gssapi instead of mod\_auth\_kerb [\#967](https://github.com/theforeman/puppet-foreman/pull/967) ([evgeni](https://github.com/evgeni))
 - Autorequire provider in smartproxy type [\#966](https://github.com/theforeman/puppet-foreman/pull/966) ([ekohl](https://github.com/ekohl))
@@ -32,8 +43,6 @@
 - Support Puppet 7 [\#921](https://github.com/theforeman/puppet-foreman/pull/921) ([ekohl](https://github.com/ekohl))
 - Configurable: email\_reply\_address, email\_subject\_prefix [\#913](https://github.com/theforeman/puppet-foreman/pull/913) ([knorx](https://github.com/knorx))
 - added foreman\_datacenter [\#868](https://github.com/theforeman/puppet-foreman/pull/868) ([Zenya](https://github.com/Zenya))
-- Let Function to\_symbolized\_yaml handle Datatype Sensitive [\#972](https://github.com/theforeman/puppet-foreman/pull/972) ([cocker-cc](https://github.com/cocker-cc))
-- Handle duplicate file declaration for foreman::app\_root [\#969](https://github.com/theforeman/puppet-foreman/pull/969) ([chr1s692](https://github.com/chr1s692))
 
 **Fixed bugs:**
 

Gemfile

@@ -13,11 +13,12 @@ gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
 gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
 gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
 gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
-gem 'voxpupuli-test', '~> 1.4'
+gem 'voxpupuli-test', '~> 1.4', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
 gem 'puppet_metadata', '~> 0.3'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
 gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
+gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 gem 'webmock', '~> 2.0'
 gem 'oauth'
 

Rakefile

@@ -1,10 +1,26 @@
 # This file is managed centrally by modulesync
 #   https://github.com/theforeman/foreman-installer-modulesync
 
-require 'voxpupuli/test/rake'
+# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
+# otherwise attempt to load it directly.
+begin
+  require 'voxpupuli/test/rake'
+rescue LoadError
+  begin
+    require 'puppetlabs_spec_helper/rake_tasks'
+  rescue LoadError
+  end
+end
 
-# We use fixtures in our modules, which is not the default
-task :beaker => 'spec_prep'
+# load optional tasks for acceptance
+# only available if gem group releases is installed
+begin
+  require 'voxpupuli/acceptance/rake'
+rescue LoadError
+else
+  # We use fixtures in our modules, which is not the default
+  task :beaker => 'spec_prep'
+end
 
 # blacksmith isn't always present, e.g. on Travis with --without development
 begin

manifests/cli/puppet.pp

@@ -0,0 +1,10 @@
+# = Hammer Puppet plugin
+#
+# This installs the Puppet plugin for Hammer CLI
+#
+# === Parameters:
+#
+class foreman::cli::puppet {
+  foreman::cli::plugin { 'foreman_puppet':
+  }
+}

manifests/cli/webhooks.pp

@@ -0,0 +1,10 @@
+# = Hammer Webhooks plugin
+#
+# This installs the Webhooks plugin for Hammer CLI
+#
+# === Parameters:
+#
+class foreman::cli::webhooks {
+  foreman::cli::plugin { 'foreman_webhooks':
+  }
+}

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-foreman",
-  "version": "18.0.0",
+  "version": "18.1.0",
   "author": "theforeman",
   "summary": "Foreman server configuration",
   "license": "GPL-3.0+",

spec/acceptance/foreman_cli_plugins_spec.rb

@@ -24,13 +24,15 @@ class { 'foreman::cli':
         include foreman::cli::remote_execution
         include foreman::cli::tasks
         include foreman::cli::templates
+        include foreman::cli::webhooks
+        include foreman::cli::puppet
         PUPPET
       end
     end
 
     it_behaves_like 'hammer'
 
-    ['discovery', 'remote_execution', 'tasks', 'templates'].each do |plugin|
+    ['discovery', 'remote_execution', 'tasks', 'templates', 'webhooks', 'puppet'].each do |plugin|
       package_name = case fact('os.family')
                      when 'RedHat'
                        "#{package_prefix}rubygem-hammer_cli_foreman_#{plugin}"

spec/classes/cli_plugins_spec.rb

@@ -2,7 +2,7 @@
 
 supported = on_supported_os
 
-['ansible', 'azure', 'discovery', 'katello', 'kubevirt', 'openscap', 'remote_execution', 'tasks', 'templates', 'virt_who_configure'].each do |plugin|
+['ansible', 'azure', 'discovery', 'katello', 'kubevirt', 'openscap', 'remote_execution', 'tasks', 'templates', 'virt_who_configure', 'webhooks', 'puppet'].each do |plugin|
   describe "foreman::cli::#{plugin}" do
     supported.each do |os, os_facts|
       context "on #{os}" do