Merge lp:~lutostag/charms/trusty/jenkins/jenkins+executor+remote-deb+plugins-move into lp:charms/trusty/jenkins
Proposed by
Greg Lutostanski
Status: | Merged |
---|---|
Merged at revision: | 37 |
Proposed branch: | lp:~lutostag/charms/trusty/jenkins/jenkins+executor+remote-deb+plugins-move |
Merge into: | lp:charms/trusty/jenkins |
Diff against target: |
136 lines (+36/-10) 4 files modified
config.yaml (+7/-1) hooks/jenkins_hooks.py (+7/-3) hooks/jenkins_utils.py (+21/-6) templates/jenkins-config.xml (+1/-0) |
To merge this branch: | bzr merge lp:~lutostag/charms/trusty/jenkins/jenkins+executor+remote-deb+plugins-move |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adam Israel (community) | Approve | ||
Review Queue (community) | automated testing | Approve | |
Ryan Beisner (community) | Needs Information | ||
Review via email: mp+280974@code.launchpad.net |
Description of the change
Use a fully specified plugins-site -- don't change plugins-url to */latest/, just have it use the url directly, and change the default to take care of this.
Allow installing from remote deb link -- means you can change which version of jenkins you are using without bundling or having external net access for the ci-jenkins deb repos.
Allow setting number of executors on master explicitly with a config option.
To post a comment you must log in.
This item has failed automated testing! Results available here http:// juju-ci. vapour. ws:8080/ job/charm- bundle- test-lxc/ 1867/