Merge branch 'jenkins-build-4' into 'master'

Auto-merge for build 4

See merge request puppet/resources_cd!1

Jenkinsfile

@@ -91,7 +91,12 @@ pipeline {
                 git config user.name "Jenkins Server"
                 git config user.email jenkins@confdroid.com
                 git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push origin HEAD:master
+                git push -o merge_request.create \
+                         -o merge_request.target=master \
+                         -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
+                         -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
+                         -o merge_request.merge_when_pipeline_succeeds=true \
+                         origin jenkins-build-$BUILD_NUMBER
             '''
         }
       }

doc/puppet_classes/resources_cd_3A_3Amain_3A_3Aepel.html

@@ -149,7 +149,7 @@ class resources_cd::main::epel (
       'epel':
         descr      => "Extra Packages for Enterprise Linux 9 - \$basearch",
         mirrorlist => 'https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=$basearch&infra=$infra&content=$contentdir',
-        enabled    => '1',
+        enabled    => $rs_enable_epel,
         gpgcheck   => '0',
         require    => Exec['install EPEL RPM'],
     }

doc/puppet_classes/resources_cd_3A_3Aparams.html

@@ -146,10 +146,10 @@
         <span class='name'>rs_enable_epel</span>
       
       
-        <span class='type'>(<tt>Boolean</tt>)</span>
+        <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>false</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
       
       
         &mdash;
@@ -193,7 +193,7 @@ class resources_cd::params (
     &#39;Rocky&#39;   =&gt; [&#39;yum&#39;, &#39;yum-utils&#39;],
   },
   String $pkg_ensure        = &#39;present&#39;,
-  Boolean $rs_enable_epel   = false,
+  String $rs_enable_epel    = &#39;1&#39;,
 
 ) {
   $epel_from_url            = &#39;https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm&#39;

manifests/main/epel.pp

@@ -22,7 +22,7 @@ class resources_cd::main::epel (
       'epel':
         descr      => "Extra Packages for Enterprise Linux 9 - \$basearch",
         mirrorlist => 'https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=$basearch&infra=$infra&content=$contentdir',
-        enabled    => '1',
+        enabled    => $rs_enable_epel,
         gpgcheck   => '0',
         require    => Exec['install EPEL RPM'],
     }

manifests/params.pp

@@ -4,7 +4,7 @@
 # @summary Class contains all parameters for the resources_cd module.
 # @param [Array] reqpackages which packages to install
 # @param [String] pkg_ensure version to install, 'present', 'latest', 'v1.0'
-# @param [Boolean] rs_enable_epel whether to enable epel
+# @param [String] rs_enable_epel whether to enable epel
 ##############################################################################
 class resources_cd::params (
 
@@ -12,7 +12,7 @@ class resources_cd::params (
     'Rocky'   => ['yum', 'yum-utils'],
   },
   String $pkg_ensure        = 'present',
-  Boolean $rs_enable_epel   = false,
+  String $rs_enable_epel    = '1',
 
 ) {
   $epel_from_url            = 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm'