From 271e54d2bf00e9761abdbe4d19951da3935cb9ee Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 16 Sep 2025 11:48:58 +0200 Subject: [PATCH 1/3] add switching ability for EPEL --- Jenkinsfile | 7 ++++++- manifests/main/epel.pp | 2 +- manifests/params.pp | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) 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/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..d5c394b 100644 --- a/manifests/params.pp +++ b/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' From 1e4b976cc28ca233cebb56a2095494bdc457219c Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 16 Sep 2025 11:49:35 +0200 Subject: [PATCH 2/3] add switching ability for EPEL --- manifests/params.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index d5c394b..52ba558 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -11,11 +11,11 @@ class resources_cd::params ( Array $reqpackages = $facts['os']['name'] ? { 'Rocky' => ['yum', 'yum-utils'], }, - String $pkg_ensure = 'present', - String $rs_enable_epel = '1', + 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 } From 2d7150dcea1e90ca88ef45b8fd85c13d08b530a1 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 16 Sep 2025 11:51:36 +0200 Subject: [PATCH 3/3] Recommit for updates in build 4 --- .../resources_cd_3A_3Amain_3A_3Aepel.html | 2 +- doc/puppet_classes/resources_cd_3A_3Aparams.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 }