Skip to content

Commit 2f11eea

Browse files
authored
Bugfix/oracle crb (#775)
* the `crb` repo is named `ol9_codeready_builder` in oracle linux 9 * update CHANGELOG * allow use of alternative distributions * lint * The `powertools` repo is named `ol8_codeready_builder` in oracle linux 8
1 parent 1ce45ce commit 2f11eea

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Standardise files with files in sous-chefs/repo-management
88

99
Standardise files with files in sous-chefs/repo-management
1010

11+
- Fix installation of `pg` gem build dependency `perl-IPC-Run` on oracle linux 9
12+
1113
## 11.10.3 - *2024-05-03*
1214

1315
- Bump deepsort fuzzy dependency to 0.5.0 to match latest upstream release

kitchen.dokken.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
driver:
22
name: dokken
33
privileged: true
4+
chef_image: <%= ENV['CHEF_IMAGE'] || 'chef/chef' %>
45
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
56

67
transport: { name: dokken }
7-
provisioner: { name: dokken }
8+
provisioner:
9+
name: dokken
10+
project_name: <%= ENV['PROJECT_NAME'] || 'chef' %>
11+
chef_binary: <%= ENV['CHEF_BINARY'] || '/opt/chef/bin/chef-client' %>
812

913
platforms:
1014
- name: almalinux-8

libraries/sql/_connection.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,21 @@ def install_pg_gem
8484
declare_resource(:package, libpq_package_name) { compile_time(true) }
8585
declare_resource(:package, 'perl-IPC-Run') do
8686
compile_time(true)
87-
options('--enablerepo=powertools')
87+
if platform?('oracle')
88+
options ['--enablerepo=ol8_codeready_builder']
89+
else
90+
options('--enablerepo=powertools')
91+
end
8892
end
8993
when 9
9094
declare_resource(:package, libpq_package_name) { compile_time(true) }
9195
declare_resource(:package, 'perl-IPC-Run') do
9296
compile_time(true)
93-
options('--enablerepo=crb')
97+
if platform?('oracle')
98+
options ['--enablerepo=ol9_codeready_builder']
99+
else
100+
options('--enablerepo=crb')
101+
end
94102
end
95103
end
96104
end

0 commit comments

Comments
 (0)