Merge lp://staging/~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install into lp://staging/~canonical-ci-engineering/charms/trusty/jenkins/ubiquity

Proposed by Paul Larson
Status: Merged
Merged at revision: 49
Proposed branch: lp://staging/~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install
Merge into: lp://staging/~canonical-ci-engineering/charms/trusty/jenkins/ubiquity
Diff against target: 118 lines (+22/-24)
4 files modified
README.ubiquity-testing (+6/-0)
config.yaml (+1/-5)
deploy.yaml (+1/-5)
hooks/install (+14/-14)
To merge this branch: bzr merge lp://staging/~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install
Reviewer Review Type Date Requested Status
Joe Talbott (community) Approve
Paul Larson Needs Resubmitting
Review via email: mp+250760@code.staging.launchpad.net

Description of the change

Bring back Joseph's much better idea of allowing installation of jenkins from a files dir, and also add in plugin installation from there.

To post a comment you must log in.
52. By Paul Larson

add back the ubiquity-branch

Revision history for this message
Joe Talbott (joetalbott) wrote :

One minor thing in-line.

review: Needs Fixing
53. By Paul Larson

Remove support for url install method

Revision history for this message
Paul Larson (pwlars) wrote :

URL removeda

review: Needs Resubmitting
Revision history for this message
Joe Talbott (joetalbott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches