From 90d69f5e19e9bac98341956ea06b34bde2656491 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 12 Sep 2025 22:03:49 +0000 Subject: [PATCH 1/3] Initial plan From 56dd9baa658173a72a4af1d34b072a5d6cd4873a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 12 Sep 2025 22:09:22 +0000 Subject: [PATCH 2/3] Implement CRB repository enablement for CentOS 9+ platforms Co-authored-by: damacus <40786+damacus@users.noreply.github.com> --- kitchen.yml | 1 + libraries/package_deps.rb | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index 426f14d2..a43ebc65 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -14,6 +14,7 @@ verifier: platforms: - name: centos-7 - name: centos-8 + - name: centos-stream-9 - name: fedora-latest - name: debian-10 - name: debian-11 diff --git a/libraries/package_deps.rb b/libraries/package_deps.rb index f9b2e3b2..1fdddf40 100644 --- a/libraries/package_deps.rb +++ b/libraries/package_deps.rb @@ -6,6 +6,7 @@ def install_ruby_dependencies when /^jruby-/ package jruby_package_deps else + enable_crb_repository_if_needed package_deps.each do |deps| package deps end @@ -23,6 +24,29 @@ def ensure_java_environment Chef::Log.info 'The java cookbook does not appear to in the run_list.' end + def enable_crb_repository_if_needed + return unless node['platform_family'] == 'rhel' && node['platform_version'].to_i >= 9 + + case node['platform'] + when 'centos' + repository_name = 'crb' + when 'almalinux', 'rocky' + repository_name = 'crb' + when 'redhat' + repository_name = 'codeready-builder-for-rhel-9-x86_64-rpms' + else + repository_name = 'crb' # Default for other RHEL 9+ derivatives + end + + # Install dnf-plugins-core if not already present + package 'dnf-plugins-core' + + execute "enable #{repository_name} repository" do + command "dnf config-manager --set-enabled #{repository_name}" + not_if "dnf repolist enabled | grep -q #{repository_name}" + end + end + def jruby_package_deps case node['platform_family'] when 'rhel', 'fedora', 'amazon' From 0efb1647cdc29805f9607b5a54f3ebd5c0192d3f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 14 Sep 2025 01:03:54 +0000 Subject: [PATCH 3/3] Fix cookstyle warnings Co-authored-by: damacus <40786+damacus@users.noreply.github.com> --- libraries/helpers.rb | 2 +- libraries/package_deps.rb | 20 ++++++++++---------- resources/script.rb | 2 +- resources/user_install.rb | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libraries/helpers.rb b/libraries/helpers.rb index c7c2c826..0ecb7fbf 100644 --- a/libraries/helpers.rb +++ b/libraries/helpers.rb @@ -108,7 +108,7 @@ def ruby_installed? end def verbose - return '-v' if new_resource.verbose + '-v' if new_resource.verbose end end end diff --git a/libraries/package_deps.rb b/libraries/package_deps.rb index 1fdddf40..629aa7bc 100644 --- a/libraries/package_deps.rb +++ b/libraries/package_deps.rb @@ -27,16 +27,16 @@ def ensure_java_environment def enable_crb_repository_if_needed return unless node['platform_family'] == 'rhel' && node['platform_version'].to_i >= 9 - case node['platform'] - when 'centos' - repository_name = 'crb' - when 'almalinux', 'rocky' - repository_name = 'crb' - when 'redhat' - repository_name = 'codeready-builder-for-rhel-9-x86_64-rpms' - else - repository_name = 'crb' # Default for other RHEL 9+ derivatives - end + repository_name = case node['platform'] + when 'centos' + 'crb' + when 'almalinux', 'rocky' + 'crb' + when 'redhat' + 'codeready-builder-for-rhel-9-x86_64-rpms' + else + 'crb' # Default for other RHEL 9+ derivatives + end # Install dnf-plugins-core if not already present package 'dnf-plugins-core' diff --git a/resources/script.rb b/resources/script.rb index c88e36ef..cc890f47 100644 --- a/resources/script.rb +++ b/resources/script.rb @@ -54,7 +54,7 @@ property :returns, Array, default: [0], - description: 'The return value for a command. This may be an array of accepted values.' + description: 'The return value for a command. This may be an array of accepted values.' property :timeout, Integer, diff --git a/resources/user_install.rb b/resources/user_install.rb index e9bb5e07..3cd89215 100644 --- a/resources/user_install.rb +++ b/resources/user_install.rb @@ -46,8 +46,8 @@ property :update_rbenv, [true, - false], default: true, - description: 'Update rbenv definitions.' + false], default: true, + description: 'Update rbenv definitions.' action :install do package package_prerequisites