Skip to content

Commit

Permalink
Bugfix/oracle crb (#775)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dschlenk authored Sep 28, 2024
1 parent 1ce45ce commit 2f11eea
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 10 additions & 2 deletions libraries/sql/_connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2f11eea

Please sign in to comment.