-
Notifications
You must be signed in to change notification settings - Fork 567
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
add darwin/osx support to slave class #351
Conversation
slave_uid logic isn't necessary as undef will be passed to user type
Thank you for a pull request! Please check this document for how the Jenkins project handles pull requests |
@@ -67,6 +68,19 @@ | |||
end | |||
end | |||
|
|||
# describe 'Darwin' do |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any reason for these examples to be commented out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm still learning rspec, and can't figure out how to get the tests to ignore java install on darwin.
Failures:
1) jenkins::slave Darwin with slave_name behaves like using slave_name should contain File[/home/jenkins-slave/jenkins-slave] with content =~ /^CLIENT_NAME="jenkins-slave"$/
Failure/Error: it { should contain_file(slave_runtime_file).with_content(/^CLIENT_NAME="jenkins-slave"$/) }
Puppet::Error:
Could not find resource 'Class[Java]' for relationship on 'Service[jenkins-slave]' on node myosx.local
Shared Example Group: "using slave_name" called from ./spec/classes/jenkins_slave_spec.rb:80
# ./spec/classes/jenkins_slave_spec.rb:43:in `block (3 levels) in <top (required)>'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so the puppetlabs/java module doesn't support Darwin so I think part of why this is failing.
@adamcstephens overall, looking very good! some minor comments that I've added; can't wait to get this merged |
I'm going to merge this and try to clean it up a bit myself before release |
add darwin/osx support to slave class
Ok, sorry. I started on the refactor earlier in the week but work got the better of me. |
@adamcstephens no big deal, this has since been released :) |
This utilizes the existing defaults file, along with a wrapper script and launchd service. There is no wget by default on OSX so use curl there (could be used everywhere, or instead use a puppet module such as archive).