Merge lp://qastaging/~ack/landscape-charm/deploy-targets-local-charm into lp://qastaging/~landscape/landscape-charm/trunk

Proposed by Alberto Donato
Status: Merged
Approved by: Alberto Donato
Approved revision: 377
Merged at revision: 376
Proposed branch: lp://qastaging/~ack/landscape-charm/deploy-targets-local-charm
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 22 lines (+2/-5)
1 file modified
Makefile (+2/-5)
To merge this branch: bzr merge lp://qastaging/~ack/landscape-charm/deploy-targets-local-charm
Reviewer Review Type Date Requested Status
Данило Шеган (community) Approve
Simon Poirier (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+313199@code.qastaging.launchpad.net

Commit message

Change deploy-* targets to always deploy from the local branch (since they're meant for testing deployments from a local branch with a standalone package).

Description of the change

Change deploy-* targets to always deploy from the local branch (since they're meant for testing deployments from a local branch with a standalone package).

Testing instructions:

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: 376
Branch: lp:~ack/landscape-charm/deploy-targets-local-charm
Jenkins: https://ci.lscape.net/job/latch-test-trusty/70/

review: Approve (test results)
Revision history for this message
Simon Poirier (simpoir) wrote :

Doesn't this just duplicate the deploy-local target that's already there?

review: Needs Information
377. By Alberto Donato

Drop duplicated target.

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: 377
Branch: lp:~ack/landscape-charm/deploy-targets-local-charm
Jenkins: https://ci.lscape.net/job/latch-test-trusty/74/

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

> Doesn't this just duplicate the deploy-local target that's already there?

Good point, I dropped the deploy-local target.

Revision history for this message
Simon Poirier (simpoir) wrote :

+1 lgtm

review: Approve
Revision history for this message
Данило Шеган (danilo) :
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