Merge lp://qastaging/~danilo/landscape-charm/gpg-options into lp://qastaging/~landscape/landscape-charm/trunk

Proposed by Данило Шеган
Status: Merged
Approved by: Данило Шеган
Approved revision: 375
Merged at revision: 371
Proposed branch: lp://qastaging/~danilo/landscape-charm/gpg-options
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 183 lines (+67/-15)
5 files modified
lib/relations/hosted.py (+7/-4)
lib/relations/tests/test_hosted.py (+26/-10)
lib/tests/test_services.py (+3/-1)
lib/tests/test_templates.py (+23/-0)
templates/service.conf (+8/-0)
To merge this branch: bzr merge lp://qastaging/~danilo/landscape-charm/gpg-options
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Alberto Donato (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+309109@code.qastaging.launchpad.net

Commit message

Make gpg-home-path and gpg-passphrase-path required in "hosted" relation data and use them to write out entries in service.conf.

Description of the change

Make gpg-home-path and gpg-passphrase-path required in "hosted" relation data and use them to write out entries in service.conf.

Testing instructions:

1. Test without landscape-hosted charm
2. Test with landscape-hosted charm: see https://code.launchpad.net/~danilo/landscape-hosted-charm/gpg-options/+merge/309107

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: Fail
Revno: 373
Branch: lp:~danilo/landscape-charm/gpg-options
Jenkins: https://ci.lscape.net/job/latch-test-trusty/12/

review: Needs Fixing (test results)
374. By Данило Шеган

Provide required values in the hosted relation test.

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: 374
Branch: lp:~danilo/landscape-charm/gpg-options
Jenkins: https://ci.lscape.net/job/latch-test-trusty/14/

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

LGTM, +1

review: Approve
Revision history for this message
Данило Шеган (danilo) :
Revision history for this message
Данило Шеган (danilo) :
Revision history for this message
Chris Glass (tribaal) wrote :

+1!

review: Approve
375. By Данило Шеган

Fix comment alignment as per review from Alberto.

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