bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwmon...@apache.org
Subject bigtop git commit: BIGTOP-2739: refresh juju bundles with latest charm revs (closes #195)
Date Wed, 12 Apr 2017 21:29:00 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master c6bd2a2d9 -> 2b7f74bc4


BIGTOP-2739: refresh juju bundles with latest charm revs (closes #195)

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


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2b7f74bc
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2b7f74bc
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2b7f74bc

Branch: refs/heads/master
Commit: 2b7f74bc43bba4f86cb865cea2b8b07182dc12ec
Parents: c6bd2a2
Author: Kevin W Monroe <kevin.monroe@canonical.com>
Authored: Wed Mar 29 20:16:48 2017 +0000
Committer: Kevin W Monroe <kevin.monroe@canonical.com>
Committed: Wed Apr 12 16:28:00 2017 -0500

----------------------------------------------------------------------
 bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml | 12 ++++++++--
 .../juju/hadoop-hbase/bundle-local.yaml         | 12 ++++++++--
 bigtop-deploy/juju/hadoop-hbase/bundle.yaml     | 24 ++++++++++++-------
 .../juju/hadoop-hbase/tests/01-bundle.py        |  2 --
 .../juju/hadoop-hbase/tests/tests.yaml          |  2 +-
 bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml | 13 ++++++++--
 .../juju/hadoop-kafka/bundle-local.yaml         | 13 ++++++++--
 bigtop-deploy/juju/hadoop-kafka/bundle.yaml     | 25 +++++++++++++-------
 .../juju/hadoop-kafka/tests/01-bundle.py        |  2 --
 .../juju/hadoop-kafka/tests/tests.yaml          |  2 +-
 .../juju/hadoop-processing/bundle-dev.yaml      |  9 +++++--
 .../juju/hadoop-processing/bundle-local.yaml    |  9 +++++--
 .../juju/hadoop-processing/bundle.yaml          | 17 ++++++++-----
 .../juju/hadoop-processing/tests/01-bundle.py   |  2 --
 .../juju/hadoop-processing/tests/tests.yaml     |  2 +-
 bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml | 13 ++++++++--
 .../juju/hadoop-spark/bundle-local.yaml         | 13 ++++++++--
 bigtop-deploy/juju/hadoop-spark/bundle.yaml     | 25 +++++++++++++-------
 .../juju/hadoop-spark/tests/01-bundle.py        |  6 ++---
 .../juju/hadoop-spark/tests/tests.yaml          |  2 +-
 .../juju/spark-processing/bundle-dev.yaml       | 10 ++++++--
 .../juju/spark-processing/bundle-local.yaml     | 10 ++++++--
 bigtop-deploy/juju/spark-processing/bundle.yaml | 17 +++++++++----
 .../juju/spark-processing/tests/tests.yaml      |  2 +-
 24 files changed, 176 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml
index e4737e1..064b84d 100644
--- a/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml
+++ b/bigtop-deploy/juju/hadoop-hbase/bundle-dev.yaml
@@ -65,7 +65,7 @@ services:
       - "6"
       - "7"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -73,7 +73,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -115,17 +115,25 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml
index 7ae57f6..34d3cb7 100644
--- a/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml
+++ b/bigtop-deploy/juju/hadoop-hbase/bundle-local.yaml
@@ -65,7 +65,7 @@ services:
       - "6"
       - "7"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -73,7 +73,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -115,17 +115,25 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-hbase/bundle.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml
index 95b63d7..9e3c823 100644
--- a/bigtop-deploy/juju/hadoop-hbase/bundle.yaml
+++ b/bigtop-deploy/juju/hadoop-hbase/bundle.yaml
@@ -1,6 +1,6 @@
 services:
   namenode:
-    charm: "cs:xenial/hadoop-namenode-12"
+    charm: "cs:xenial/hadoop-namenode-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -9,7 +9,7 @@ services:
     to:
       - "0"
   resourcemanager:
-    charm: "cs:xenial/hadoop-resourcemanager-13"
+    charm: "cs:xenial/hadoop-resourcemanager-14"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -18,7 +18,7 @@ services:
     to:
       - "0"
   slave:
-    charm: "cs:xenial/hadoop-slave-12"
+    charm: "cs:xenial/hadoop-slave-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 3
     annotations:
@@ -29,7 +29,7 @@ services:
       - "2"
       - "3"
   plugin:
-    charm: "cs:xenial/hadoop-plugin-12"
+    charm: "cs:xenial/hadoop-plugin-13"
     annotations:
       gui-x: "1000"
       gui-y: "400"
@@ -43,7 +43,7 @@ services:
     to:
       - "4"
   hbase:
-    charm: "cs:xenial/hbase-10"
+    charm: "cs:xenial/hbase-11"
     constraints: "mem=7G root-disk=32G"
     num_units: 3
     annotations:
@@ -54,7 +54,7 @@ services:
       - "2"
       - "3"
   zookeeper:
-    charm: "cs:xenial/zookeeper-16"
+    charm: "cs:xenial/zookeeper-17"
     constraints: "mem=3G root-disk=32G"
     num_units: 3
     annotations:
@@ -65,7 +65,7 @@ services:
       - "6"
       - "7"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -73,7 +73,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -115,17 +115,25 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-hbase/tests/01-bundle.py
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-hbase/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-hbase/tests/01-bundle.py
index 166ac54..bb72605 100755
--- a/bigtop-deploy/juju/hadoop-hbase/tests/01-bundle.py
+++ b/bigtop-deploy/juju/hadoop-hbase/tests/01-bundle.py
@@ -27,8 +27,6 @@ class TestBundle(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        # classmethod inheritance doesn't work quite right with
-        # setUpClass / tearDownClass, so subclasses have to manually call this
         cls.d = amulet.Deployment(series='xenial')
         with open(cls.bundle_file) as f:
             bun = f.read()

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-hbase/tests/tests.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-hbase/tests/tests.yaml b/bigtop-deploy/juju/hadoop-hbase/tests/tests.yaml
index a3b7803..b951742 100644
--- a/bigtop-deploy/juju/hadoop-hbase/tests/tests.yaml
+++ b/bigtop-deploy/juju/hadoop-hbase/tests/tests.yaml
@@ -1,5 +1,5 @@
 reset: false
-bundle_deploy: false
+deployment_timeout: 3600
 sources:
   - 'ppa:juju/stable'
 packages:

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml
index 45b821f..0ea56fa 100644
--- a/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml
+++ b/bigtop-deploy/juju/hadoop-kafka/bundle-dev.yaml
@@ -81,7 +81,7 @@ services:
     to:
       - "8"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -89,7 +89,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -133,19 +133,28 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "8":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml
index bd89872..0f26d33 100644
--- a/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml
+++ b/bigtop-deploy/juju/hadoop-kafka/bundle-local.yaml
@@ -81,7 +81,7 @@ services:
     to:
       - "8"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -89,7 +89,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -133,19 +133,28 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "8":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-kafka/bundle.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml
index 80aa895..948c889 100644
--- a/bigtop-deploy/juju/hadoop-kafka/bundle.yaml
+++ b/bigtop-deploy/juju/hadoop-kafka/bundle.yaml
@@ -1,6 +1,6 @@
 services:
   namenode:
-    charm: "cs:xenial/hadoop-namenode-12"
+    charm: "cs:xenial/hadoop-namenode-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -9,7 +9,7 @@ services:
     to:
       - "0"
   resourcemanager:
-    charm: "cs:xenial/hadoop-resourcemanager-13"
+    charm: "cs:xenial/hadoop-resourcemanager-14"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -18,7 +18,7 @@ services:
     to:
       - "0"
   slave:
-    charm: "cs:xenial/hadoop-slave-12"
+    charm: "cs:xenial/hadoop-slave-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 3
     annotations:
@@ -29,7 +29,7 @@ services:
       - "2"
       - "3"
   plugin:
-    charm: "cs:xenial/hadoop-plugin-12"
+    charm: "cs:xenial/hadoop-plugin-13"
     annotations:
       gui-x: "1000"
       gui-y: "400"
@@ -52,7 +52,7 @@ services:
     to:
       - "4"
   zookeeper:
-    charm: "cs:xenial/zookeeper-16"
+    charm: "cs:xenial/zookeeper-17"
     constraints: "mem=3G root-disk=32G"
     num_units: 3
     annotations:
@@ -63,7 +63,7 @@ services:
       - "6"
       - "7"
   kafka:
-    charm: "cs:xenial/kafka-11"
+    charm: "cs:xenial/kafka-12"
     constraints: "mem=3G"
     num_units: 1
     annotations:
@@ -81,7 +81,7 @@ services:
     to:
       - "8"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -89,7 +89,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -133,19 +133,28 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "8":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-kafka/tests/01-bundle.py
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-kafka/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-kafka/tests/01-bundle.py
index fb113fc..24f8bed 100755
--- a/bigtop-deploy/juju/hadoop-kafka/tests/01-bundle.py
+++ b/bigtop-deploy/juju/hadoop-kafka/tests/01-bundle.py
@@ -27,8 +27,6 @@ class TestBundle(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        # classmethod inheritance doesn't work quite right with
-        # setUpClass / tearDownClass, so subclasses have to manually call this
         cls.d = amulet.Deployment(series='xenial')
         with open(cls.bundle_file) as f:
             bun = f.read()

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-kafka/tests/tests.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-kafka/tests/tests.yaml b/bigtop-deploy/juju/hadoop-kafka/tests/tests.yaml
index a3b7803..b951742 100644
--- a/bigtop-deploy/juju/hadoop-kafka/tests/tests.yaml
+++ b/bigtop-deploy/juju/hadoop-kafka/tests/tests.yaml
@@ -1,5 +1,5 @@
 reset: false
-bundle_deploy: false
+deployment_timeout: 3600
 sources:
   - 'ppa:juju/stable'
 packages:

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml
index 20ae8af..265e69f 100644
--- a/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/bundle-dev.yaml
@@ -43,7 +43,7 @@ services:
     to:
       - "4"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -51,7 +51,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -87,11 +87,16 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml
index b277df4..a6dd892 100644
--- a/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/bundle-local.yaml
@@ -43,7 +43,7 @@ services:
     to:
       - "4"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -51,7 +51,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -87,11 +87,16 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-processing/bundle.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-processing/bundle.yaml b/bigtop-deploy/juju/hadoop-processing/bundle.yaml
index fcd1017..c4d8005 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-12"
+    charm: "cs:xenial/hadoop-namenode-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -9,7 +9,7 @@ services:
     to:
       - "0"
   resourcemanager:
-    charm: "cs:xenial/hadoop-resourcemanager-13"
+    charm: "cs:xenial/hadoop-resourcemanager-14"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -18,7 +18,7 @@ services:
     to:
       - "0"
   slave:
-    charm: "cs:xenial/hadoop-slave-12"
+    charm: "cs:xenial/hadoop-slave-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 3
     annotations:
@@ -29,7 +29,7 @@ services:
       - "2"
       - "3"
   plugin:
-    charm: "cs:xenial/hadoop-plugin-12"
+    charm: "cs:xenial/hadoop-plugin-13"
     annotations:
       gui-x: "1000"
       gui-y: "400"
@@ -43,7 +43,7 @@ services:
     to:
       - "4"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -51,7 +51,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -87,11 +87,16 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py
index 51d1c3d..2127cfc 100755
--- a/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py
+++ b/bigtop-deploy/juju/hadoop-processing/tests/01-bundle.py
@@ -27,8 +27,6 @@ class TestBundle(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        # classmethod inheritance doesn't work quite right with
-        # setUpClass / tearDownClass, so subclasses have to manually call this
         cls.d = amulet.Deployment(series='xenial')
         with open(cls.bundle_file) as f:
             bun = f.read()

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml b/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml
index a3b7803..b951742 100644
--- a/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/tests/tests.yaml
@@ -1,5 +1,5 @@
 reset: false
-bundle_deploy: false
+deployment_timeout: 3600
 sources:
   - 'ppa:juju/stable'
 packages:

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml b/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml
index a42242e..847cebd 100644
--- a/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml
+++ b/bigtop-deploy/juju/hadoop-spark/bundle-dev.yaml
@@ -65,7 +65,7 @@ services:
       - "7"
       - "8"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -73,7 +73,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -115,19 +115,28 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "8":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml
index bffc459..61b7ecf 100644
--- a/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml
+++ b/bigtop-deploy/juju/hadoop-spark/bundle-local.yaml
@@ -65,7 +65,7 @@ services:
       - "7"
       - "8"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -73,7 +73,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -115,19 +115,28 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "8":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-spark/bundle.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-spark/bundle.yaml b/bigtop-deploy/juju/hadoop-spark/bundle.yaml
index cfbdd8b..500ae78 100644
--- a/bigtop-deploy/juju/hadoop-spark/bundle.yaml
+++ b/bigtop-deploy/juju/hadoop-spark/bundle.yaml
@@ -1,6 +1,6 @@
 services:
   namenode:
-    charm: "cs:xenial/hadoop-namenode-12"
+    charm: "cs:xenial/hadoop-namenode-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -9,7 +9,7 @@ services:
     to:
       - "0"
   resourcemanager:
-    charm: "cs:xenial/hadoop-resourcemanager-13"
+    charm: "cs:xenial/hadoop-resourcemanager-14"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     annotations:
@@ -18,7 +18,7 @@ services:
     to:
       - "0"
   slave:
-    charm: "cs:xenial/hadoop-slave-12"
+    charm: "cs:xenial/hadoop-slave-13"
     constraints: "mem=7G root-disk=32G"
     num_units: 3
     annotations:
@@ -29,7 +29,7 @@ services:
       - "2"
       - "3"
   plugin:
-    charm: "cs:xenial/hadoop-plugin-12"
+    charm: "cs:xenial/hadoop-plugin-13"
     annotations:
       gui-x: "1000"
       gui-y: "400"
@@ -43,7 +43,7 @@ services:
     to:
       - "4"
   spark:
-    charm: "cs:xenial/spark-24"
+    charm: "cs:xenial/spark-31"
     constraints: "mem=7G root-disk=32G"
     num_units: 1
     options:
@@ -54,7 +54,7 @@ services:
     to:
       - "5"
   zookeeper:
-    charm: "cs:xenial/zookeeper-16"
+    charm: "cs:xenial/zookeeper-17"
     constraints: "mem=3G root-disk=32G"
     num_units: 3
     annotations:
@@ -65,7 +65,7 @@ services:
       - "7"
       - "8"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -73,7 +73,7 @@ services:
     to:
       - "4"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -115,19 +115,28 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G"
   "5":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "6":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "7":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "8":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py
index 1dc4147..9d58cc9 100755
--- a/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py
+++ b/bigtop-deploy/juju/hadoop-spark/tests/01-bundle.py
@@ -27,8 +27,6 @@ class TestBundle(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        # classmethod inheritance doesn't work quite right with
-        # setUpClass / tearDownClass, so subclasses have to manually call this
         cls.d = amulet.Deployment(series='xenial')
         with open(cls.bundle_file) as f:
             bun = f.read()
@@ -88,7 +86,9 @@ class TestBundle(unittest.TestCase):
         assert 'DataNode' not in yarn, "DataNode should not be running on resourcemanager"
         assert 'DataNode' not in hdfs, "DataNode should not be running on namenode"
 
-        assert 'Master' in spark, "Spark Master not started"
+        assert 'HistoryServer' in spark, "Spark HistoryServer not started"
+        assert 'Master' not in spark, "Spark Master should not be running in yarn mode"
+        assert 'Worker' not in spark, "Spark Worker should not be running in yarn mode"
 
     def test_hdfs(self):
         """

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/hadoop-spark/tests/tests.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/hadoop-spark/tests/tests.yaml b/bigtop-deploy/juju/hadoop-spark/tests/tests.yaml
index a3b7803..b951742 100644
--- a/bigtop-deploy/juju/hadoop-spark/tests/tests.yaml
+++ b/bigtop-deploy/juju/hadoop-spark/tests/tests.yaml
@@ -1,5 +1,5 @@
 reset: false
-bundle_deploy: false
+deployment_timeout: 3600
 sources:
   - 'ppa:juju/stable'
 packages:

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/spark-processing/bundle-dev.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/spark-processing/bundle-dev.yaml b/bigtop-deploy/juju/spark-processing/bundle-dev.yaml
index af76214..4ace0da 100644
--- a/bigtop-deploy/juju/spark-processing/bundle-dev.yaml
+++ b/bigtop-deploy/juju/spark-processing/bundle-dev.yaml
@@ -21,7 +21,7 @@ services:
       - "3"
       - "4"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -29,7 +29,7 @@ services:
     to:
       - "5"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -58,13 +58,19 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "5":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/spark-processing/bundle-local.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/spark-processing/bundle-local.yaml b/bigtop-deploy/juju/spark-processing/bundle-local.yaml
index 63cdc6f..95a28f0 100644
--- a/bigtop-deploy/juju/spark-processing/bundle-local.yaml
+++ b/bigtop-deploy/juju/spark-processing/bundle-local.yaml
@@ -21,7 +21,7 @@ services:
       - "3"
       - "4"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -29,7 +29,7 @@ services:
     to:
       - "5"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -58,13 +58,19 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "5":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/spark-processing/bundle.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/spark-processing/bundle.yaml b/bigtop-deploy/juju/spark-processing/bundle.yaml
index 70ef4cf..bb79d94 100644
--- a/bigtop-deploy/juju/spark-processing/bundle.yaml
+++ b/bigtop-deploy/juju/spark-processing/bundle.yaml
@@ -1,8 +1,11 @@
 services:
   spark:
-    charm: "cs:xenial/spark-24"
+    charm: "cs:xenial/spark-31"
     constraints: "mem=7G root-disk=32G"
     num_units: 2
+    options:
+      driver_memory: "3g"
+      executor_memory: "3g"
     annotations:
       gui-x: "500"
       gui-y: "0"
@@ -10,7 +13,7 @@ services:
       - "0"
       - "1"
   zookeeper:
-    charm: "cs:xenial/zookeeper-16"
+    charm: "cs:xenial/zookeeper-17"
     constraints: "mem=3G root-disk=32G"
     num_units: 3
     annotations:
@@ -21,7 +24,7 @@ services:
       - "3"
       - "4"
   ganglia:
-    charm: "cs:~bigdata-dev/xenial/ganglia-5"
+    charm: "cs:xenial/ganglia-12"
     num_units: 1
     annotations:
       gui-x: "0"
@@ -29,7 +32,7 @@ services:
     to:
       - "5"
   ganglia-node:
-    charm: "cs:~bigdata-dev/xenial/ganglia-node-7"
+    charm: "cs:xenial/ganglia-node-7"
     annotations:
       gui-x: "250"
       gui-y: "400"
@@ -58,13 +61,19 @@ relations:
 machines:
   "0":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "1":
     series: "xenial"
+    constraints: "mem=7G root-disk=32G"
   "2":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "3":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "4":
     series: "xenial"
+    constraints: "mem=3G root-disk=32G"
   "5":
     series: "xenial"
+    constraints: "mem=3G"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b7f74bc/bigtop-deploy/juju/spark-processing/tests/tests.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/juju/spark-processing/tests/tests.yaml b/bigtop-deploy/juju/spark-processing/tests/tests.yaml
index 8a28f2b..e4b472e 100644
--- a/bigtop-deploy/juju/spark-processing/tests/tests.yaml
+++ b/bigtop-deploy/juju/spark-processing/tests/tests.yaml
@@ -1,5 +1,5 @@
 reset: false
-bundle_deploy: false
+deployment_timeout: 3600
 sources:
   - 'ppa:juju/stable'
 packages:


Mime
View raw message