Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include yum-epel cookbook on RHEL platforms for new daemonize package dependency #776

Merged
merged 2 commits into from
Aug 29, 2021
+16 −1
Merged

Include yum-epel cookbook on RHEL platforms for new daemonize package dependency #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cb366a
Include yum-epel cookbook on RHEL platforms for new daemonize package…
ramereth Aug 27, 2021
03d03dc
Add new `update_center_sleep` attribute to set the time to wait for u…
ramereth Aug 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ 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
- Add new `update_center_sleep` attribute to set the time to wait for updates to quiesce in Jenkins

## 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
6 changes: 6 additions & 0 deletions attributes/master.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,12 @@
#
master['ulimits'] = nil

#
# Sleep time in seconds to allow the update center data to quiesce in Jenkins.
# This is so that we don't run into issues with plugin installations which can
# happen depending on system load.
master['update_center_sleep'] = 5

#
# Repository URL and key. Default is stable.
#
Expand Down
2 changes: 2 additions & 0 deletions kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ provisioner:
# 30 seconds was too low, so I bumped it to 5 minutes
# https://issues.jenkins-ci.org/browse/JENKINS-38623
jenkins_args: '--httpKeepAliveTimeout=300000'
# This it to help issues we run into on the CI systems
update_center_sleep: 10

platforms:
- name: amazonlinux-2
Expand Down
2 changes: 1 addition & 1 deletion libraries/_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ def ensure_update_center_present!

# Allow updates to quiesce in Jenkins so that we don't run into issues
# with plugin installations which may happen directly after this.
sleep 5
sleep node['jenkins']['master']['update_center_sleep']

true
end
Expand Down
1 change: 1 addition & 0 deletions metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
supports 'ubuntu'

depends 'dpkg_autostart'
depends 'yum-epel'
3 changes: 3 additions & 0 deletions recipes/_master_package.rb
View file
Open in desktop
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