Skip to content

Commit

Permalink
Include yum-epel cookbook on RHEL platforms for new daemonize package…
Browse files Browse the repository at this point in the history
… dependency

- Set Chef Infra Client ceiling to < 17.4 to workaround issue with resources not working
  - Resource helpers need to be rewritten for this to start working properly
    again and will happen in a later release

Signed-off-by: Lance Albertson <lance@osuosl.org>
  • Loading branch information
ramereth committed Aug 27, 2021
1 parent 05f06f9 commit 6f4c45a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ This file is used to list changes made in each version of the jenkins cookbook.

## Unreleased

- Include yum-epel cookbook on RHEL platforms for new daemonize package dependency
- Set Chef Infra Client ceiling to < 17.4 to workaround issue with resources not working
- Resource helpers need to be rewritten for this to start working properly again and will happen in a later release

## 9.1.0 - *2021-08-11*

- Added option for jenkins-cli authentication with a credential file - [@amcappelli](https://github.com/amcappelli) and [@ddegoede](https://github.com/ddegoede)
Expand Down
2 changes: 1 addition & 1 deletion kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
driver:
name: dokken
privileged: true # because Docker and SystemD
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
chef_version: <%= ENV['CHEF_VERSION'] || '17.3' %> # TODO: Resources fail to run on newer versions
env: [CHEF_LICENSE=accept]
## Uncomment to allow access to the Jenkins webui which is useful when troubleshooting
# ports:
Expand Down
3 changes: 2 additions & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
version '9.1.0'
source_url 'https://github.com/sous-chefs/jenkins'
issues_url 'https://github.com/sous-chefs/jenkins/issues'
chef_version '>= 13.0'
chef_version '>= 13.0', '< 17.4' # TODO: Resources fail to run on newer versions

supports 'amazon'
supports 'centos'
Expand All @@ -17,3 +17,4 @@
supports 'ubuntu'

depends 'dpkg_autostart'
depends 'yum-epel'
3 changes: 3 additions & 0 deletions recipes/_master_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
allow false
end
when 'rhel', 'amazon'
# Needed for installing deamonize package
include_recipe 'yum-epel'

yum_repository 'jenkins-ci' do
baseurl node['jenkins']['master']['repository']
gpgkey node['jenkins']['master']['repository_key']
Expand Down

0 comments on commit 6f4c45a

Please sign in to comment.