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

Support updates for core jenkins modules #131

Closed
wants to merge 1 commit into from

Conversation

natewarr
Copy link
Contributor

@natewarr natewarr commented May 5, 2014

This fixes #118 and will (should) not break existing configurations. If the extension of the updated module is '.jpi', then put a .pinned file in the plugins folder before installing the updated module.

@jenkinsadmin
Copy link

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

@rtyler rtyler added this to the 1.2.0: Nestor milestone May 6, 2014
@rtyler rtyler self-assigned this May 6, 2014
@rtyler
Copy link

rtyler commented May 6, 2014

@natewarr Thanks for the code, I'll have to take a look at this on the weekend when I have a chance to write some more tests for it

@natewarr
Copy link
Contributor Author

natewarr commented May 6, 2014

@rtyler Thanks for all of your hard work. Let me know how I might help further.

@rtyler
Copy link

rtyler commented May 6, 2014

@natewarr If you're not opposed to learning some rspec-puppet you could add some test cases yourself :)

@natewarr
Copy link
Contributor Author

natewarr commented May 9, 2014

@rtyler I had a feeling you might say that. It doesn't look like I'll be able to beat you to it for this one.

@jchristi
Copy link
Contributor

@natewarr per your comment on #118, I don't see how this is limited to .jpi files. From the Jenkins plugin tutorial: Create an empty file called <plugin>.hpi.pinned - e.g. maven-plugin.hpi.pinned. Is there something I'm missing?

@jchristi
Copy link
Contributor

I updated the spec tests: 9d8930b

@natewarr
Copy link
Contributor Author

My assumption is that .jpi means that the plugin is core and needs a .pinned. If its .hpi it doesn't need a pinned file. If my assumption is correct, the doc you reference is dated. I could just as easily be wrong.

@jchristi
Copy link
Contributor

Just did a quick check and here are the plugins with jpi files:

$ ls -la /var/lib/jenkins/plugins/*.jpi | awk '{print $9}'
/var/lib/jenkins/plugins/ant.jpi
/var/lib/jenkins/plugins/credentials.jpi
/var/lib/jenkins/plugins/cvs.jpi
/var/lib/jenkins/plugins/external-monitor-job.jpi
/var/lib/jenkins/plugins/javadoc.jpi
/var/lib/jenkins/plugins/ldap.jpi
/var/lib/jenkins/plugins/mailer.jpi
/var/lib/jenkins/plugins/maven-plugin.jpi
/var/lib/jenkins/plugins/pam-auth.jpi
/var/lib/jenkins/plugins/ssh-credentials.jpi
/var/lib/jenkins/plugins/ssh-slaves.jpi
/var/lib/jenkins/plugins/subversion.jpi
/var/lib/jenkins/plugins/translation.jpi

Those look like core plugins to me but its been awhile since I've messed with Jenkins so I don't know if its exhaustive. Question about the .pinned file though...if you add a .pinned file, then later update your puppet config to a newer version, won't the .pinned file prevent that from happening?

@jchristi
Copy link
Contributor

I think you're right, this seems to confirm that. I checked my installation and only core plugins can be pinned. Adding a ".pinned" file basically places the plugin under manual user control rather than being locked and controlled by Jenkins.

@natewarr natewarr changed the title Support updates for core jenkins modules; fix https://github.com/jenkinsci/puppet-jenkins/issues/118 Support updates for core jenkins modules May 15, 2014
@rtyler rtyler removed this from the 1.2.0: Nestor milestone Sep 23, 2014
@natewarr
Copy link
Contributor Author

@rtyler Let me know if/when you want to do some hacking at puppetconf. Cheers.

@natewarr
Copy link
Contributor Author

I fixed the auto-merge issue with the upstream code and smashed the commits down to one.

@rtyler
Copy link

rtyler commented Sep 24, 2014

This has been merged out of band from GItHub and is in the head of master

@rtyler rtyler closed this Sep 24, 2014
@rtyler rtyler added this to the 1.2.0: Nestor milestone Sep 24, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some plugins not updating
4 participants