diff --git a/Jenkinsfile b/Jenkinsfile
index 47679c5..c0d8484 100644
--- a/Jenkinsfile
+++ b/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
'''
}
}
diff --git a/doc/puppet_classes/resources_cd_3A_3Amain_3A_3Aepel.html b/doc/puppet_classes/resources_cd_3A_3Amain_3A_3Aepel.html
index 71ab545..7943620 100644
--- a/doc/puppet_classes/resources_cd_3A_3Amain_3A_3Aepel.html
+++ b/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'],
}
diff --git a/doc/puppet_classes/resources_cd_3A_3Aparams.html b/doc/puppet_classes/resources_cd_3A_3Aparams.html
index 0d2d4c9..f83547e 100644
--- a/doc/puppet_classes/resources_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/resources_cd_3A_3Aparams.html
@@ -146,10 +146,10 @@
rs_enable_epel
- (Boolean)
+ (String)
- (defaults to: false)
+ (defaults to: '1')
—
@@ -192,11 +192,11 @@ class resources_cd::params (
Array $reqpackages = $facts['os']['name'] ? {
'Rocky' => ['yum', 'yum-utils'],
},
- String $pkg_ensure = 'present',
- Boolean $rs_enable_epel = false,
+ String $pkg_ensure = 'present',
+ String $rs_enable_epel = '1',
) {
- $epel_from_url = 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm'
+ $epel_from_url = 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm'
# includes must be last
include resources_cd::main::config
}
diff --git a/manifests/main/epel.pp b/manifests/main/epel.pp
index 2cf98b9..bafe81e 100644
--- a/manifests/main/epel.pp
+++ b/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'],
}
diff --git a/manifests/params.pp b/manifests/params.pp
index 51f0252..52ba558 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,18 +4,18 @@
# @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 (
Array $reqpackages = $facts['os']['name'] ? {
'Rocky' => ['yum', 'yum-utils'],
},
- String $pkg_ensure = 'present',
- Boolean $rs_enable_epel = false,
+ String $pkg_ensure = 'present',
+ String $rs_enable_epel = '1',
) {
- $epel_from_url = 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm'
+ $epel_from_url = 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm'
# includes must be last
include resources_cd::main::config
}