Merge lp://qastaging/~dpb/landscape-charm/fix-dev-deployer into lp://qastaging/~landscape/landscape-charm/trunk

Proposed by David Britton
Status: Merged
Approved by: David Britton
Approved revision: 353
Merged at revision: 351
Proposed branch: lp://qastaging/~dpb/landscape-charm/fix-dev-deployer
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 27 lines (+4/-2)
2 files modified
Makefile (+2/-1)
dev/deployer (+2/-1)
To merge this branch: bzr merge lp://qastaging/~dpb/landscape-charm/fix-dev-deployer
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Chris Glass (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+296081@code.qastaging.launchpad.net

Commit message

Fix bundle checkout/manipulation in dev/deployer to:

1) render the bundles first (the static bundles were removed as they were generated code)
2) use the new directory name under build/<name>/bundle.yaml

Description of the change

Fix bundle checkout/manipulation in dev/deployer to:

1) render the bundles first (the static bundles were removed as they were generated code)
2) use the new directory name under build/<name>/bundle.yaml

Testing:

1) Checkout landscape trunk source code
2) make stage-landscape-charm
3) cd build/landscape-charm; bzr merge lp:~davidpbritton/landscape-charm/fix-dev-deployer; cd -
4) make -C build/landscape-charm deploy-dense-maas[-dev]

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 352
Branch: lp:~davidpbritton/landscape-charm/fix-dev-deployer
Jenkins: https://ci.lscape.net/job/latch-test/4851/

review: Approve (test results)
Revision history for this message
Chris Glass (tribaal) wrote :

+1, thanks for the fix!

review: Approve
Revision history for this message
Alberto Donato (ack) wrote :

+1 looks good.

Small nit inline

review: Approve
353. By David Britton

remove trailing semicolon in makefile.

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