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.

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

A bit of RedHat and Debian slave initd script merging #171

Merged
merged 1 commit into from
Sep 22, 2014

Conversation

carlossg
Copy link
Member

To avoid duplication and mismatches between Debian and RedHat, use initd scripts, both configured with a common /etc/defaults/jenkins-slave in Debian and /etc/sysconfig/jenkins-slave in RedHat

Add -mode flag to Debian slave start script
Use a single /etc/defaults or /etc/sysconfig file for both OSes
Do not customize /etc/init.d/jenkins-slave, do it in sysconfig or defaults
Log output to file in RedHat
Compose slave arguments in shell script

@jenkinsadmin
Copy link

Thank you for a pull request! Please check this document for how the Jenkins project handles pull requests

@carlossg
Copy link
Member Author

This PR supersedes #156, #129 and a bit of #153

@cfeskens
Copy link

cfeskens commented Sep 8, 2014

Thank you for adding this. Hopefully this fix is suitable for merge.

@rtyler rtyler added this to the 1.2.0: Nestor milestone Sep 22, 2014
@rtyler
Copy link

rtyler commented Sep 22, 2014

It looks like this can't be merged automatically. I'll try to rework this pull request and resolve the conflicts

Add -mode flag to Debian slave start script
Use a single /etc/defaults or /etc/sysconfig file for both OSes
Do not customize /etc/init.d/jenkins-slave, do it in sysconfig or defaults
Log output to file in RedHat
Compose slave arguments in shell script
@carlossg
Copy link
Member Author

I have rebased against master

@rtyler
Copy link

rtyler commented Sep 22, 2014

@carlossg If you're at PuppetConf we can hack on this together? :)

@carlossg
Copy link
Member Author

@rtyler unfortunately not this year, but hanging on irc

@rtyler
Copy link

rtyler commented Sep 22, 2014

I'm going to fix some of the lint warnings after merging

rtyler pushed a commit that referenced this pull request Sep 22, 2014
A bit of RedHat and Debian slave initd script merging
@rtyler rtyler merged commit 95f5b99 into voxpupuli:master Sep 22, 2014
@carlossg carlossg deleted the slave-initd branch September 22, 2014 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants