diff --git a/CHANGELOG.md b/CHANGELOG.md index 228fa289..f6790202 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ Standardise files with files in sous-chefs/repo-management Standardise files with files in sous-chefs/repo-management +- Fix installation of `pg` gem build dependency `perl-IPC-Run` on oracle linux 9 + ## 11.10.3 - *2024-05-03* - Bump deepsort fuzzy dependency to 0.5.0 to match latest upstream release diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml index 6ead9e8e..dc298c47 100644 --- a/kitchen.dokken.yml +++ b/kitchen.dokken.yml @@ -1,10 +1,14 @@ driver: name: dokken privileged: true + chef_image: <%= ENV['CHEF_IMAGE'] || 'chef/chef' %> chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> transport: { name: dokken } -provisioner: { name: dokken } +provisioner: + name: dokken + project_name: <%= ENV['PROJECT_NAME'] || 'chef' %> + chef_binary: <%= ENV['CHEF_BINARY'] || '/opt/chef/bin/chef-client' %> platforms: - name: almalinux-8 diff --git a/libraries/sql/_connection.rb b/libraries/sql/_connection.rb index 8f10e51a..d582dd2a 100644 --- a/libraries/sql/_connection.rb +++ b/libraries/sql/_connection.rb @@ -84,13 +84,21 @@ def install_pg_gem declare_resource(:package, libpq_package_name) { compile_time(true) } declare_resource(:package, 'perl-IPC-Run') do compile_time(true) - options('--enablerepo=powertools') + if platform?('oracle') + options ['--enablerepo=ol8_codeready_builder'] + else + options('--enablerepo=powertools') + end end when 9 declare_resource(:package, libpq_package_name) { compile_time(true) } declare_resource(:package, 'perl-IPC-Run') do compile_time(true) - options('--enablerepo=crb') + if platform?('oracle') + options ['--enablerepo=ol9_codeready_builder'] + else + options('--enablerepo=crb') + end end end end