Merge lp://qastaging/~bjornt/landscape-charm/bundles-render-local into lp://qastaging/~landscape/landscape-charm/trunk
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~bjornt/landscape-charm/bundles-render-local | ||||
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk | ||||
| Diff against target: |
500 lines (+458/-0) (has conflicts) 8 files modified
.bzrignore (+1/-0) Makefile (+29/-0) README.md (+28/-0) charm-store (+70/-0) landscape-template.jinja2 (+99/-0) render-bundles (+80/-0) ubuntu-deps (+53/-0) update-charm-revisions (+98/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file README.md. Moved existing file to README.md.moved. |
||||
| To merge this branch: | bzr merge lp://qastaging/~bjornt/landscape-charm/bundles-render-local | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Landscape | Pending | ||
| Landscape | Pending | ||
|
Review via email:
|
|||
Description of the change
Allow the branch or charm of landscape-server to be given to
render-bundles.
This allows you to generate bundles that use a local branch or charm.
It's meant to be used by lp:~bjornt/landscape-charm/deploy-local-branch.
You can see the diff for that branch here:
https:/
This will allow you to use 'make stage-landscape
landscape-server branch you're working on.
Testing instructions:
In a landscape-server branch:
CHARM_BRANCH=lp:~bjornt/landscape-charm/deploy-local-branch make stage-landscape
bzr checkout lp:~bjornt/landscape-charm/bundles-render-local build/landscape
To deploy with Juju 1.25 and juju-deployer:
make -C build/landscape
To deploy with Juju 2:
make -C build/landscape
juju-2.0 build/landscape
Unmerged revisions
- 28. By Björn Tillenius
-
Review comments.
- 27. By Björn Tillenius
-
Allow the landscape-server branch to specified to render-bundles.
- 26. By Björn Tillenius
-
Allow the landscape-server charm to specified to render-bundles.
- 25. By David Britton
-
Merge bundles-
trunk-xenial [f=1585389] [r=chad. smith,landscape -builder, fginther] [a=David Britton]
- Use Xenial charm for postgres and landscape.
- rework push/diff/publish workflow for new 'charm' tool
- make CHARM_STORE_USER required in Makefile for safety. - 24. By David Britton
-
Just do a make render [trivial]
- 23. By Andreas Hasenack
-
Updated charm revisions
- 22. By Adam Collard
-
Bump us (again) to 16.03 from 15.11 in the bundle [trivial] [r=ack]
- 21. By David Britton
-
don't use machines in 'scalable' case.
- 20. By David Britton
-
check in rendered changes to bundles.
- 19. By David Britton
-
to: needs to be an array in v4 bundles.
