lp://qastaging/~danilo/landscape-charm/gpg-options

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~landscape/landscape-charm/trunk at revision 371

Chris Glass (community): Approve on 2016-10-28

Alberto Donato (community): Approve on 2016-10-26

🤖 Landscape Builder: Approve (test results) on 2016-10-25

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

375. By Данило Шеган on 2016-10-28

Fix comment alignment as per review from Alberto.

374. By Данило Шеган on 2016-10-25

Provide required values in the hosted relation test.

373. By Данило Шеган on 2016-10-24

Add GPG options template test.

372. By Данило Шеган on 2016-10-24

Update hosted relation tests to always expect gpg-home-path and gpg-passphrase-path.

371. By Данило Шеган on 2016-10-21

Read gpg-home-path/gpg-passphrase-path from the hosted relation and write them into service.conf.

370. By Free Ekanayaka on 2016-09-23

Increase total integration tests run timeout [trivial] [r=danilo]

369. By Данило Шеган on 2016-09-21

Add python3-path, python3-libcharmstore and python3-zope.testrunner as new dependencies for amulet to dev/ubuntu-deps. [trivial][r=free]

368. By Free Ekanayaka on 2016-09-20

Merge dont-restart-when-leader-is-deposed [f=] [r=adam-collard,landscape-builder,danilo] [a=Free Ekanayaka]
This branch fixes hook errors happening when removing the
leader unit. The errors happen in the "leader-settings-changed"
hook, which is fired before any other hook and that fails
to restart services because in the meantime the postgresql
charm has already changed its configuration to not accept
connections from the leader unit.

367. By Free Ekanayaka on 2016-09-16

Merge fix-cleanup-in-ha-integration-tests [f=] [r=adam-collard,ack,landscape-builder] [a=Free Ekanayaka]
This branch fixes LandscapeHATest tests that relied on
stop_landscape_service automatically restarting the
service being stopped at test cleanup time. However that
wasn't quite happening since the EnvironmentFixture gets
set up at layer set up time and cleaned up at layer tear
down time (so not for every test).

As drive by, the branch also cleans up the ActionsTest.test_resume_fail
test which had been marked with an XXX comment because
of Bug #1598016, which is now fix in landscape.

It also speeds up the test that runs the hash-ids cron
script by replacing the regular hash-ids config with
a sample one which doesn't point to the full Ubuntu
archives but rather to a test PPA.

366. By Данило Шеган on 2016-09-15

Merge pppa-proxy [f=1591276] [r=landscape-builder,adam-collard,free.ekanayaka] [a=Данило Шеган]
Make use of the pppa-proxy configuration provided by landscape-hosted charm and configure pppa-proxy in service.conf.