Merge lp://staging/~mreed8855/charms/trusty/autotest/layered-autotest into lp://staging/~mreed8855/charms/trusty/autotest/trunk

Proposed by Michael Reed
Status: Needs review
Proposed branch: lp://staging/~mreed8855/charms/trusty/autotest/layered-autotest
Merge into: lp://staging/~mreed8855/charms/trusty/autotest/trunk
Diff against target: 17783 lines (+15930/-351)
262 files modified
Makefile (+24/-0)
README.md (+14/-0)
actions.yaml (+14/-10)
actions/custom (+1/-1)
bin/layer_option (+24/-0)
config.yaml (+39/-9)
deps/layer/layer-apt/.gitignore (+2/-0)
deps/layer/layer-apt/README.md (+220/-0)
deps/layer/layer-apt/config.yaml (+34/-0)
deps/layer/layer-apt/copyright (+15/-0)
deps/layer/layer-apt/layer.yaml (+13/-0)
deps/layer/layer-apt/lib/charms/__init__.py (+2/-0)
deps/layer/layer-apt/lib/charms/apt.py (+217/-0)
deps/layer/layer-apt/reactive/apt.py (+132/-0)
deps/layer/layer-basic/.gitignore (+5/-0)
deps/layer/layer-basic/Makefile (+24/-0)
deps/layer/layer-basic/README.md (+238/-0)
deps/layer/layer-basic/bin/layer_option (+24/-0)
deps/layer/layer-basic/copyright (+16/-0)
deps/layer/layer-basic/hooks/config-changed (+19/-0)
deps/layer/layer-basic/hooks/hook.template (+19/-0)
deps/layer/layer-basic/hooks/install (+19/-0)
deps/layer/layer-basic/hooks/leader-elected (+19/-0)
deps/layer/layer-basic/hooks/leader-settings-changed (+19/-0)
deps/layer/layer-basic/hooks/start (+19/-0)
deps/layer/layer-basic/hooks/stop (+19/-0)
deps/layer/layer-basic/hooks/update-status (+19/-0)
deps/layer/layer-basic/hooks/upgrade-charm (+28/-0)
deps/layer/layer-basic/layer.yaml (+18/-0)
deps/layer/layer-basic/lib/charms/layer/__init__.py (+21/-0)
deps/layer/layer-basic/lib/charms/layer/basic.py (+196/-0)
deps/layer/layer-basic/lib/charms/layer/execd.py (+138/-0)
deps/layer/layer-basic/metadata.yaml (+1/-0)
deps/layer/layer-basic/requirements.txt (+2/-0)
deps/layer/layer-basic/tox.ini (+12/-0)
deps/layer/layer-basic/wheelhouse.txt (+3/-0)
hooks/benchmark-relation-changed (+0/-5)
hooks/config-changed (+19/-2)
hooks/hook.template (+19/-0)
hooks/install (+19/-47)
hooks/leader-elected (+19/-0)
hooks/leader-settings-changed (+19/-0)
hooks/start (+19/-4)
hooks/stop (+19/-7)
hooks/update-status (+19/-0)
hooks/upgrade-charm (+28/-6)
layer.yaml (+15/-0)
lib/charms/__init__.py (+2/-0)
lib/charms/apt.py (+217/-0)
lib/charms/layer/__init__.py (+21/-0)
lib/charms/layer/basic.py (+196/-0)
lib/charms/layer/execd.py (+138/-0)
metadata.yaml (+7/-12)
reactive/apt.py (+132/-0)
reactive/autotest.py (+89/-0)
requirements.txt (+2/-0)
tests/00-setup (+0/-9)
tests/100-custom (+0/-46)
tests/200-dbench (+0/-46)
tests/300-stress (+0/-46)
tests/400-stressNG (+0/-46)
tests/500-ubuntuqrt (+0/-46)
tests/deployer_files/deployer-autotest_amd64.yaml (+0/-9)
tox.ini (+12/-0)
trusty/autotest/.build.manifest (+1180/-0)
trusty/autotest/.gitignore (+2/-0)
trusty/autotest/Makefile (+24/-0)
trusty/autotest/README.md (+62/-0)
trusty/autotest/actions.yaml (+14/-0)
trusty/autotest/actions/benchmark (+37/-0)
trusty/autotest/actions/custom (+11/-0)
trusty/autotest/actions/dbench (+16/-0)
trusty/autotest/actions/dbench2json.py (+28/-0)
trusty/autotest/actions/stress (+9/-0)
trusty/autotest/actions/stressng (+9/-0)
trusty/autotest/actions/ubuntuqrt (+9/-0)
trusty/autotest/bin/layer_option (+24/-0)
trusty/autotest/config.yaml (+39/-0)
trusty/autotest/copyright (+17/-0)
trusty/autotest/deps/layer/layer-apt/.gitignore (+2/-0)
trusty/autotest/deps/layer/layer-apt/README.md (+220/-0)
trusty/autotest/deps/layer/layer-apt/config.yaml (+34/-0)
trusty/autotest/deps/layer/layer-apt/copyright (+15/-0)
trusty/autotest/deps/layer/layer-apt/layer.yaml (+13/-0)
trusty/autotest/deps/layer/layer-apt/lib/charms/__init__.py (+2/-0)
trusty/autotest/deps/layer/layer-apt/lib/charms/apt.py (+217/-0)
trusty/autotest/deps/layer/layer-apt/reactive/apt.py (+132/-0)
trusty/autotest/deps/layer/layer-basic/.gitignore (+5/-0)
trusty/autotest/deps/layer/layer-basic/Makefile (+24/-0)
trusty/autotest/deps/layer/layer-basic/README.md (+238/-0)
trusty/autotest/deps/layer/layer-basic/bin/layer_option (+24/-0)
trusty/autotest/deps/layer/layer-basic/copyright (+16/-0)
trusty/autotest/deps/layer/layer-basic/hooks/config-changed (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/hook.template (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/install (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/leader-elected (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/leader-settings-changed (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/start (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/stop (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/update-status (+19/-0)
trusty/autotest/deps/layer/layer-basic/hooks/upgrade-charm (+28/-0)
trusty/autotest/deps/layer/layer-basic/layer.yaml (+18/-0)
trusty/autotest/deps/layer/layer-basic/lib/charms/layer/__init__.py (+21/-0)
trusty/autotest/deps/layer/layer-basic/lib/charms/layer/basic.py (+196/-0)
trusty/autotest/deps/layer/layer-basic/lib/charms/layer/execd.py (+138/-0)
trusty/autotest/deps/layer/layer-basic/metadata.yaml (+1/-0)
trusty/autotest/deps/layer/layer-basic/requirements.txt (+2/-0)
trusty/autotest/deps/layer/layer-basic/tox.ini (+12/-0)
trusty/autotest/deps/layer/layer-basic/wheelhouse.txt (+3/-0)
trusty/autotest/hooks/config-changed (+19/-0)
trusty/autotest/hooks/hook.template (+19/-0)
trusty/autotest/hooks/install (+19/-0)
trusty/autotest/hooks/leader-elected (+19/-0)
trusty/autotest/hooks/leader-settings-changed (+19/-0)
trusty/autotest/hooks/start (+19/-0)
trusty/autotest/hooks/stop (+19/-0)
trusty/autotest/hooks/update-status (+19/-0)
trusty/autotest/hooks/upgrade-charm (+28/-0)
trusty/autotest/icon.svg (+424/-0)
trusty/autotest/layer.yaml (+15/-0)
trusty/autotest/lib/charms/__init__.py (+2/-0)
trusty/autotest/lib/charms/apt.py (+217/-0)
trusty/autotest/lib/charms/layer/__init__.py (+21/-0)
trusty/autotest/lib/charms/layer/basic.py (+196/-0)
trusty/autotest/lib/charms/layer/execd.py (+138/-0)
trusty/autotest/metadata.yaml (+8/-0)
trusty/autotest/reactive/apt.py (+132/-0)
trusty/autotest/reactive/autotest.py (+89/-0)
trusty/autotest/requirements.txt (+2/-0)
trusty/autotest/tox.ini (+12/-0)
trusty/autotest/trusty/autotest/.build.manifest (+1180/-0)
trusty/autotest/trusty/autotest/.gitignore (+2/-0)
trusty/autotest/trusty/autotest/Makefile (+24/-0)
trusty/autotest/trusty/autotest/README.md (+62/-0)
trusty/autotest/trusty/autotest/actions.yaml (+14/-0)
trusty/autotest/trusty/autotest/actions/benchmark (+37/-0)
trusty/autotest/trusty/autotest/actions/custom (+11/-0)
trusty/autotest/trusty/autotest/actions/dbench (+16/-0)
trusty/autotest/trusty/autotest/actions/dbench2json.py (+28/-0)
trusty/autotest/trusty/autotest/actions/stress (+9/-0)
trusty/autotest/trusty/autotest/actions/stressng (+9/-0)
trusty/autotest/trusty/autotest/actions/ubuntuqrt (+9/-0)
trusty/autotest/trusty/autotest/bin/layer_option (+24/-0)
trusty/autotest/trusty/autotest/config.yaml (+39/-0)
trusty/autotest/trusty/autotest/copyright (+17/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/.gitignore (+2/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/README.md (+220/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/config.yaml (+34/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/copyright (+15/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/layer.yaml (+13/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/lib/charms/__init__.py (+2/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/lib/charms/apt.py (+217/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-apt/reactive/apt.py (+132/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/.gitignore (+5/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/Makefile (+24/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/README.md (+238/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/bin/layer_option (+24/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/copyright (+16/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/config-changed (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/hook.template (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/install (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/leader-elected (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/leader-settings-changed (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/start (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/stop (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/update-status (+19/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/upgrade-charm (+28/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/layer.yaml (+18/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/lib/charms/layer/__init__.py (+21/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/lib/charms/layer/basic.py (+196/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/lib/charms/layer/execd.py (+138/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/metadata.yaml (+1/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/requirements.txt (+2/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/tox.ini (+12/-0)
trusty/autotest/trusty/autotest/deps/layer/layer-basic/wheelhouse.txt (+3/-0)
trusty/autotest/trusty/autotest/hooks/config-changed (+19/-0)
trusty/autotest/trusty/autotest/hooks/hook.template (+19/-0)
trusty/autotest/trusty/autotest/hooks/install (+19/-0)
trusty/autotest/trusty/autotest/hooks/leader-elected (+19/-0)
trusty/autotest/trusty/autotest/hooks/leader-settings-changed (+19/-0)
trusty/autotest/trusty/autotest/hooks/start (+19/-0)
trusty/autotest/trusty/autotest/hooks/stop (+19/-0)
trusty/autotest/trusty/autotest/hooks/update-status (+19/-0)
trusty/autotest/trusty/autotest/hooks/upgrade-charm (+28/-0)
trusty/autotest/trusty/autotest/icon.svg (+424/-0)
trusty/autotest/trusty/autotest/layer.yaml (+15/-0)
trusty/autotest/trusty/autotest/lib/charms/__init__.py (+2/-0)
trusty/autotest/trusty/autotest/lib/charms/apt.py (+217/-0)
trusty/autotest/trusty/autotest/lib/charms/layer/__init__.py (+21/-0)
trusty/autotest/trusty/autotest/lib/charms/layer/basic.py (+196/-0)
trusty/autotest/trusty/autotest/lib/charms/layer/execd.py (+138/-0)
trusty/autotest/trusty/autotest/metadata.yaml (+8/-0)
trusty/autotest/trusty/autotest/reactive/apt.py (+132/-0)
trusty/autotest/trusty/autotest/reactive/autotest.py (+89/-0)
trusty/autotest/trusty/autotest/requirements.txt (+2/-0)
trusty/autotest/trusty/autotest/tox.ini (+12/-0)
trusty/autotest/trusty/autotest/trusty/autotest/.build.manifest (+1180/-0)
trusty/autotest/trusty/autotest/trusty/autotest/.gitignore (+2/-0)
trusty/autotest/trusty/autotest/trusty/autotest/Makefile (+24/-0)
trusty/autotest/trusty/autotest/trusty/autotest/README.md (+62/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions.yaml (+14/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions/benchmark (+37/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions/custom (+11/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions/dbench (+16/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions/dbench2json.py (+28/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions/stress (+9/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions/stressng (+9/-0)
trusty/autotest/trusty/autotest/trusty/autotest/actions/ubuntuqrt (+9/-0)
trusty/autotest/trusty/autotest/trusty/autotest/bin/layer_option (+24/-0)
trusty/autotest/trusty/autotest/trusty/autotest/config.yaml (+39/-0)
trusty/autotest/trusty/autotest/trusty/autotest/copyright (+17/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/.gitignore (+2/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/README.md (+220/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/config.yaml (+34/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/copyright (+15/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/layer.yaml (+13/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/lib/charms/__init__.py (+2/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/lib/charms/apt.py (+217/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-apt/reactive/apt.py (+132/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/.gitignore (+5/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/Makefile (+24/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/README.md (+238/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/bin/layer_option (+24/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/copyright (+16/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/config-changed (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/hook.template (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/install (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/leader-elected (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/leader-settings-changed (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/start (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/stop (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/update-status (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/hooks/upgrade-charm (+28/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/layer.yaml (+18/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/lib/charms/layer/__init__.py (+21/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/lib/charms/layer/basic.py (+196/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/lib/charms/layer/execd.py (+138/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/metadata.yaml (+1/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/requirements.txt (+2/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/tox.ini (+12/-0)
trusty/autotest/trusty/autotest/trusty/autotest/deps/layer/layer-basic/wheelhouse.txt (+3/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/config-changed (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/hook.template (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/install (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/leader-elected (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/leader-settings-changed (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/start (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/stop (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/update-status (+19/-0)
trusty/autotest/trusty/autotest/trusty/autotest/hooks/upgrade-charm (+28/-0)
trusty/autotest/trusty/autotest/trusty/autotest/icon.svg (+424/-0)
trusty/autotest/trusty/autotest/trusty/autotest/layer.yaml (+15/-0)
trusty/autotest/trusty/autotest/trusty/autotest/lib/charms/__init__.py (+2/-0)
trusty/autotest/trusty/autotest/trusty/autotest/lib/charms/apt.py (+217/-0)
trusty/autotest/trusty/autotest/trusty/autotest/lib/charms/layer/__init__.py (+21/-0)
trusty/autotest/trusty/autotest/trusty/autotest/lib/charms/layer/basic.py (+196/-0)
trusty/autotest/trusty/autotest/trusty/autotest/lib/charms/layer/execd.py (+138/-0)
trusty/autotest/trusty/autotest/trusty/autotest/metadata.yaml (+8/-0)
trusty/autotest/trusty/autotest/trusty/autotest/reactive/apt.py (+132/-0)
trusty/autotest/trusty/autotest/trusty/autotest/reactive/autotest.py (+89/-0)
trusty/autotest/trusty/autotest/trusty/autotest/requirements.txt (+2/-0)
trusty/autotest/trusty/autotest/trusty/autotest/tox.ini (+12/-0)
To merge this branch: bzr merge lp://staging/~mreed8855/charms/trusty/autotest/layered-autotest
Reviewer Review Type Date Requested Status
Michael Reed Pending
Review via email: mp+319699@code.staging.launchpad.net

Description of the change

I am updating this charm to a layered Charm.

To post a comment you must log in.

Unmerged revisions

6. By Michael Reed

Converting existing charm to a layered charm

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

to all changes: