lp:~free.ekanayaka/landscape-charm/pause-action

Branch merges

Propose for merging

No branches dependent on this one.

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

Alberto Donato (community): Approve on 2015-05-08

Данило Шеган (community): Approve on 2015-05-07

🤖 Landscape Builder: Approve (test results) on 2015-05-07

Diff: 147 lines (+59/-5)

9 files modified

Makefile (+1/-1)
actions.yaml (+4/-0)
actions/pause (+9/-0)
charm-helpers.yaml (+1/-1)
lib/callbacks/scripts.py (+2/-1)
lib/paths.py (+1/-0)
lib/pause.py (+18/-0)
lib/tests/helpers.py (+1/-2)
lib/tests/test_pause.py (+22/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1418101: Add a juju action for pausing a unit

Medium

Fix Released

Link a bug report

Related blueprints

260. By Free Ekanayaka on 2015-05-07

Add pause action

259. By Free Ekanayaka on 2015-05-06

Merge deploy-targets-dont-depend-on-tests [f=1447926] [r=landscape-builder,chad.smith,davidpbritton] [a=Free Ekanayaka]
This branch makes the "deploy" and "deploy-dense-maas" targets not depend on integration tests.

258. By Free Ekanayaka on 2015-05-06

Merge switch-to-amulet-part-2 [f=1447163] [r=landscape-builder,chad.smith,danilo] [a=Free Ekanayaka]
This branch completes the switch to Amulet. To run the tests, make
sure your juju setup points to a non-bootstrapped local provider

257. By Free Ekanayaka on 2015-05-06

Merge switch-to-amulet-part-1 [f=1447047] [r=tribaal,landscape-builder,chad.smith] [a=Free Ekanayaka]
This branch is the first of two branches that will make us switch to Amulet.

In particular:

- Add an EnvironmentFixture class to tests/helpers.py that cares of driving amulet and deploying the desired test bundle.

- Move the code to download the SSL certificate of the haproxy unit from tests/02-ssl.py to tests/helpers.py, since it's now going to be used in other test files as well.

- Convert tests/02-ssl.py to use the new fixture.

256. By Free Ekanayaka on 2015-05-04

Merge consolidate-paths [f=1449459] [r=tribaal,landscape-builder,ack] [a=Free Ekanayaka]
Add a new hooks/lib/paths.py module which encapsulates file system paths that are relevant to the charm, so we can re-base the root of the file system to a temporary directory for testing, and we have a central place where integration points with the file system are managed.

255. By Данило Шеган on 2015-04-29

Merge license-file-support [f=1446393] [r=landscape-builder,ack,free.ekanayaka] [a=Данило Шеган]
Introduce license-file config option support

This re-introduces support for license-file config option as it exists with a stable charm.
It supports putting a direct base64-encoded string into the option, or a file://, http:// or https:// URL to get a license file from.

254. By Free Ekanayaka on 2015-04-23

Fix haproxy relation name [trivial] [r=tribaal]

253. By Chris Glass on 2015-04-23

Merge add-root-url [f=1446178] [r=free.ekanayaka,benji,landscape-builder] [a=Chris Glass]
This branch introduces a root-url global configuration item, and sets it to either the
value of the root-url charm configuration option or (if it's not present), the
haproxy's public-address (as set throught the website relation).

252. By Free Ekanayaka on 2015-04-21

Merge test-data-dry [f=1445459] [r=tealeg,bjornt,landscape-builder] [a=Free Ekanayaka]
Move to setUp() the creation of "common" test data in test_services.py and test_templates.py, effectively reversing the setup logic in individual tests (they now declare what the don't want rather than what they want). This makes tests more terse and clear on what they want/don't want, at the expense of having to know a bit more of the default context.

251. By Free Ekanayaka on 2015-04-21

Merge cleanup-legacy-integration-tests [f=1444865] [r=tribaal,adam-collard,landscape-builder] [a=Free Ekanayaka]
This branch drops some legacy integration tests that don't make sense anymore (like the ones for URLs that are now served directly by the appserver, or the ones about the stores/schema config which do not make sense anymore since we generate the config from scratch, and in case it's not there services won't start at all).

It also enables tests around cron script (it was enough to add a static [maintenance] section to the service.conf template).