diff options
author | Kevin W Monroe <kevin.monroe@canonical.com> | 2017-03-19 02:03:16 +0000 |
---|---|---|
committer | Kevin W Monroe <kevin.monroe@canonical.com> | 2017-03-27 23:11:00 -0500 |
commit | 4a24c4bd92ce3b917901493b45bb923ef555b2c2 (patch) | |
tree | 3d05e4525322450a70cc8d81243faf683440ff4e /bigtop-deploy/juju/hadoop-processing/tests | |
parent | 895ecd5deb59e5e81bb4ec729c556c43499c7031 (diff) |
BIGTOP-2712: Juju CI driven updates (closes #189)
Signed-off-by: Kevin W Monroe <kevin.monroe@canonical.com>
Diffstat (limited to 'bigtop-deploy/juju/hadoop-processing/tests')
-rwxr-xr-x | bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py | 12 | ||||
-rw-r--r-- | bigtop-deploy/juju/hadoop-processing/tests/tests.yaml | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py index b10ed225..51d1c3d1 100755 --- a/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py +++ b/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py @@ -34,6 +34,18 @@ class TestBundle(unittest.TestCase): bun = f.read() bundle = yaml.safe_load(bun) + # NB: strip machine ('to') placement. We don't seem to be guaranteed + # the same machine numbering after the initial bundletester deployment, + # so we might fail when redeploying --to a specific machine to run + # these bundle tests. This is ok because all charms in this bundle are + # using 'reset: false', so we'll already have our deployment just the + # way we want it by the time this test runs. This was originally + # raised as: + # https://github.com/juju/amulet/issues/148 + for service, service_config in bundle['services'].items(): + if 'to' in service_config: + del service_config['to'] + cls.d.load(bundle) cls.d.setup(timeout=3600) diff --git a/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml b/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml index 84f78d7d..a3b7803f 100644 --- a/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml +++ b/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml @@ -1,7 +1,13 @@ reset: false -deployment_timeout: 3600 +bundle_deploy: false sources: - 'ppa:juju/stable' packages: - amulet - python3-yaml +# exclude tests that are unrelated to bigtop. +excludes: + - ganglia + - ganglia-node + - rsyslog + - rsyslog-forwarder-ha |