Merge lp:~fginther/charms/trusty/jenkins-remote-slave/jenkins-phablet-slave into lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
Proposed by
Francis Ginther
Status: | Merged |
---|---|
Approved by: | Francis Ginther |
Approved revision: | 32 |
Merged at revision: | 14 |
Proposed branch: | lp:~fginther/charms/trusty/jenkins-remote-slave/jenkins-phablet-slave |
Merge into: | lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk |
Diff against target: |
242 lines (+120/-17) 12 files modified
config.yaml (+8/-0) files/99-adb.rules (+1/-0) files/lp/authentication.conf (+4/-0) files/lp/bazaar.conf (+3/-0) files/lp/config (+2/-0) hooks/install (+30/-10) hooks/install.d/0000-init.sh (+10/-0) hooks/install.d/3000-ci-tools.sh (+31/-0) hooks/install.d/4000-lp-keys.sh (+19/-0) hooks/start (+3/-1) hooks/stop (+3/-1) metadata.yaml (+6/-5) |
To merge this branch: | bzr merge lp:~fginther/charms/trusty/jenkins-remote-slave/jenkins-phablet-slave |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Larson | Approve | ||
Evan (community) | Needs Fixing | ||
Vincent Ladeuil (community) | Approve | ||
Review via email: mp+235872@code.launchpad.net |
Commit message
Allow specification of a jenkins master and slave name to connect to instead of a master set via a relationship. Add provisioning scripts to setup an adb host and keys for operation with the ci-teams existing jobs.
Description of the change
Allow specification of a jenkins master and slave name to connect to instead of a master set via a relationship. Add provisioning scripts to setup an adb host and keys for operation with the ci-teams existing jobs.
To post a comment you must log in.
Nice job !
A few inline comments but no blockers, I think I don't quite understand the details of how it works (but I can't see anything that should break either ;).