Landscape Charm

Merge lp://qastaging/~bjornt/landscape-charm/deploy-local-branch into lp://qastaging/~landscape/landscape-charm/trunk

  1. deploy-local-branch
  2. Merge into trunk
Proposed by Björn Tillenius
Status: Merged
Approved by: Björn Tillenius
Approved revision: 355
Merged at revision: 353
Proposed branch: lp://qastaging/~bjornt/landscape-charm/deploy-local-branch
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 45 lines (+16/-3)
1 file modified
Makefile (+16/-3)
To merge this branch: bzr merge lp://qastaging/~bjornt/landscape-charm/deploy-local-branch
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Approve
Chris Glass (community) Approve
Alberto Donato (community) Approve
Review via email: mp+296670@code.qastaging.launchpad.net

Commit message

Allow the local branch to be deployed using the bundles.

It changes the make targets to allow the local charm be specified either
as charm: (for Juju 2.0) for branch: (for Juju 1.25 and juju-deployer)

Description of the change

Allow the local branch to be deployed using the bundles.

It changes the make targets to allow the local charm be specified either
as charm: (for Juju 2.0) for branch: (for Juju 1.25 and juju-deployer)

It requires lp:~bjornt/landscape-charm/bundles-render-local to be landed
first.

Testing instructions:

See https://code.launchpad.net/~bjornt/landscape-charm/bundles-render-local/+merge/296668

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: 353
Branch: lp:~bjornt/landscape-charm/deploy-local-branch
Jenkins: https://ci.lscape.net/job/latch-test/4910/

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

Nice, +1 with a comment

review: Approve
lp://qastaging/~bjornt/landscape-charm/deploy-local-branch updated
354. By Björn Tillenius

Update the deploy-dense-maas-dev to depend on bundles-local-branch.

Revision history for this message
Björn Tillenius (bjornt) :
Revision history for this message
Chris Glass (tribaal) wrote :

+1, with the discussed point added.

review: Approve
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: 354
Branch: lp:~bjornt/landscape-charm/deploy-local-branch
Jenkins: https://ci.lscape.net/job/latch-test/4915/

review: Approve (test results)
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: 354
Branch: lp:~bjornt/landscape-charm/deploy-local-branch
Jenkins: https://ci.lscape.net/job/latch-test/4949/

review: Approve (test results)
lp://qastaging/~bjornt/landscape-charm/deploy-local-branch updated
355. By Björn Tillenius

Add repo-file-trunk to deploy-dense-maas-dev.

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