BIGTOP-2712: Juju CI driven updates (closes #189)

Signed-off-by: Kevin W Monroe <kevin.monroe@canonical.com>

6 files changed, 32 insertions, 14 deletions

diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml
index 00fbdffe..20ae8afc 100644
--- a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml
@@ -51,7 +51,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-6"
+    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml
index 39e7a2a6..b277df4d 100644
--- a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml
@@ -51,7 +51,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-6"
+    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
diff --git a/bigtop-deploy/juju/hadoop-processing/bundle.yaml b/bigtop-deploy/juju/hadoop-processing/bundle.yaml
index c4c6ad66..fcd1017e 100644
--- a/bigtop-deploy/juju/hadoop-processing/bundle.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/bundle.yaml
@@ -1,6 +1,6 @@
 services:
   namenode:
-    charm: "cs:xenial/hadoop-namenode-11"
+    charm: "cs:xenial/hadoop-namenode-12"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -9,7 +9,7 @@ services:
     to:
       - "0"
   resourcemanager:
-    charm: "cs:xenial/hadoop-resourcemanager-11"
+    charm: "cs:xenial/hadoop-resourcemanager-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -18,7 +18,7 @@ services:
     to:
       - "0"
   slave:
-    charm: "cs:xenial/hadoop-slave-11"
+    charm: "cs:xenial/hadoop-slave-12"
     constraints: "mem=7G root-disk=32G"
     num_units: 3
     annotations:
@@ -29,7 +29,7 @@ services:
       - "2"
       - "3"
   plugin:
-    charm: "cs:xenial/hadoop-plugin-11"
+    charm: "cs:xenial/hadoop-plugin-12"
     annotations:
       gui-x: "1000"
       gui-y: "400"
@@ -51,7 +51,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-6"
+    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
diff --git a/bigtop-deploy/juju/hadoop-processing/ci-info.yaml b/bigtop-deploy/juju/hadoop-processing/ci-info.yaml
index 72e20825..38ec28b2 100644
--- a/bigtop-deploy/juju/hadoop-processing/ci-info.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/ci-info.yaml
@@ -2,25 +2,25 @@ bundle:
   name: hadoop-processing
   namespace: bigdata-charmers
   release: true
-  to-channel: beta
+  to-channel: edge
 charm-upgrade:
   hadoop-namenode:
     from-channel: edge
-    release: true
+    release: false
     to-channel: beta
   hadoop-resourcemanager:
     from-channel: edge
-    release: true
+    release: false
     to-channel: beta
   hadoop-slave:
     from-channel: edge
-    release: true
+    release: false
     to-channel: beta
   hadoop-client:
     from-channel: edge
-    release: true
+    release: false
     to-channel: beta
   hadoop-plugin:
     from-channel: edge
-    release: true
+    release: false
     to-channel: beta
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