Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/trunk into lp:charms/trusty/apache-hadoop-compute-slave

[Cory Johns]

Remove trivial test in favor of bundle tests.

[lp:~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/trunk]

105. By Cory Johns on 2015-10-05

Removed duplicate status function and fix lint errors

106. By Cory Johns on 2015-10-06

Re-added trivial test

107. By Cory Johns on 2015-10-06

Update mailing list

108. By Cory Johns on 2015-10-06

Switch to S3 for flume binaries

[Kevin W Monroe (kwmonroe)]

LGTM, +1

review: Approve

=== modified file 'README.md'
--- README.md	2015-09-15 18:29:08 +0000
+++ README.md	2015-10-06 18:23:28 +0000
@@ -96,7 +96,7 @@
 
 ## Contact Information
 
-- <[e-mail]>
+- <[e-mail]>
 
 
 ## Hadoop

=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py	2015-08-24 15:15:12 +0000
+++ hooks/callbacks.py	2015-10-06 18:23:28 +0000
@@ -21,7 +21,6 @@
 from jujubigdata.relations import NameNodeMaster, ResourceManagerMaster, Ganglia
 from charmhelpers.core.templating import render
 from functools import partial
-from subprocess import check_call
 
 
 def update_blocked_status():
@@ -61,16 +60,6 @@
     ))
 
 
-def update_working_status():
-    if unitdata.kv().get('charm.active', False):
-        hookenv.status_set('maintenance', 'Updating configuration')
-        return
-    yarn_connected = ResourceManagerMaster().connected_units()
-    hookenv.status_set('maintenance', 'Setting up DataNode%s' % (
-        ' and NodeManager' if yarn_connected else '',
-    ))
-
-
 def update_active_status():
     hdfs_ready = NameNodeMaster().is_ready()
     yarn_connected = ResourceManagerMaster().connected_units()
@@ -112,6 +101,6 @@
     if ganglia_metrics_changed:
         #check_call(['actions/restart-hdfs'])
         # IMPLEMENT RESTART COMPUTE SLAVE?
-        hookenv.log("please manually restart compute slave hadoop components", level=None) 
+        hookenv.log("please manually restart compute slave hadoop components", level=None)
 
 purge_ganglia_metrics = partial(conf_ganglia_metrics, purgeConf=True)

=== modified file 'resources.yaml'
--- resources.yaml	2015-09-15 18:29:08 +0000
+++ resources.yaml	2015-10-06 18:23:28 +0000
@@ -19,10 +19,10 @@
     hash: 03ad135835bfe413f85fe176259237a8
     hash_type: md5
   hadoop-ppc64le:
-    url: https://git.launchpad.net/bigdata-data/plain/apache/ppc64le/hadoop-2.4.1-ppc64le.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0
+    url: https://s3.amazonaws.com/jujubigdata/apache/ppc64le/hadoop-2.4.1-ppc64le-09942b1.tar.gz
     hash: 09942b168a3db0d183b281477d3dae9deb7b7bc4b5783ba5cda3965b62e71bd5
     hash_type: sha256
   hadoop-x86_64:
-    url: https://git.launchpad.net/bigdata-data/plain/apache/x86_64/hadoop-2.4.1.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0
+    url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/hadoop-2.4.1-a790d39.tar.gz
     hash: a790d39baba3a597bd226042496764e0520c2336eedb28a1a3d5c48572d3b672
     hash_type: sha256

=== added directory 'tests'
=== removed directory 'tests'
=== removed file 'tests/00-setup'
--- tests/00-setup	2015-02-17 03:21:13 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if ! dpkg -s amulet &> /dev/null; then
-    echo Installing Amulet...
-    sudo add-apt-repository -y ppa:juju/stable
-    sudo apt-get update
-    sudo apt-get -y install amulet
-fi

=== added file 'tests/01-basic-deployment.py'
--- tests/01-basic-deployment.py	1970-01-01 00:00:00 +0000
+++ tests/01-basic-deployment.py	2015-10-06 18:23:28 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+import unittest
+import amulet
+
+
+class TestDeploy(unittest.TestCase):
+    """
+    Trivial deployment test for Apache Hadoop Compute Slave.
+
+    This charm cannot do anything useful by itself, so integration testing
+    is done in the bundle.
+    """
+
+    def test_deploy(self):
+        self.d = amulet.Deployment(series='trusty')
+        self.d.add('compute-slave', 'apache-hadoop-compute-slave')
+        self.d.setup(timeout=900)
+        self.d.sentry.wait(timeout=1800)
+        self.unit = self.d.sentry['compute-slave'][0]
+
+
+if __name__ == '__main__':
+    unittest.main()

=== removed file 'tests/01-basic-deployment.py'
--- tests/01-basic-deployment.py	2015-09-15 17:14:40 +0000
+++ tests/01-basic-deployment.py	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-
-import unittest
-import amulet
-
-
-class TestDeploy(unittest.TestCase):
-    """
-    Basic deployment test for Apache Hadoop Compute Slave.
-
-    This charm cannot do anything useful by itself, so integration testing
-    is done in the bundle.
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.d = amulet.Deployment(series='trusty')
-        cls.d.add('apache-hadoop-compute-slave')
-        cls.d.setup(timeout=900)
-        cls.d.sentry.wait(timeout=1800)
-        cls.unit = cls.d.sentry.unit['apache-hadoop-compute-slave/0']
-
-    def test_deploy(self):
-        output, retcode = self.unit.run("pgrep -a java")
-        assert 'ResourceManager' not in output, "ResourceManager should not be started"
-        assert 'JobHistoryServer' not in output, "JobHistoryServer should not be started"
-        assert 'NodeManager' not in output, "NodeManager should not be started"
-        assert 'NameNode' not in output, "NameNode should not be started"
-        assert 'SecondaryNameNode' not in output, "SecondaryNameNode should not be started"
-        assert 'DataNode' not in output, "DataServer should not be started"
-
-    def test_dist_config(self):
-        # test_dist_config.py is run on the deployed unit because it
-        # requires the Juju context to properly validate dist.yaml
-        output, retcode = self.unit.run("tests/remote/test_dist_config.py")
-        self.assertEqual(retcode, 0, 'Remote dist config test failed:\n{}'.format(output))
-
-
-if __name__ == '__main__':
-    unittest.main()

=== removed directory 'tests/remote'
=== removed file 'tests/remote/test_dist_config.py'
--- tests/remote/test_dist_config.py	2015-08-21 21:51:17 +0000
+++ tests/remote/test_dist_config.py	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-import grp
-import os
-import pwd
-import unittest
-
-from charmhelpers.contrib import bigdata
-
-
-class TestDistConfig(unittest.TestCase):
-    """
-    Test that the ``dist.yaml`` settings were applied properly, such as users, groups, and dirs.
-
-    This is done as a remote test on the deployed unit rather than a regular
-    test under ``tests/`` because filling in the ``dist.yaml`` requires Juju
-    context (e.g., config).
-    """
-    @classmethod
-    def setUpClass(cls):
-        config = None
-        config_dir = os.environ['JUJU_CHARM_DIR']
-        config_file = 'dist.yaml'
-        if os.path.isfile(os.path.join(config_dir, config_file)):
-            config = os.path.join(config_dir, config_file)
-        if not config:
-            raise IOError('Could not find {} in {}'.format(config_file, config_dir))
-        reqs = ['vendor', 'hadoop_version', 'packages', 'groups', 'users',
-                'dirs', 'ports']
-        cls.dist_config = bigdata.utils.DistConfig(config, reqs)
-
-    def test_groups(self):
-        for name in self.dist_config.groups:
-            try:
-                grp.getgrnam(name)
-            except KeyError:
-                self.fail('Group {} is missing'.format(name))
-
-    def test_users(self):
-        for username, details in self.dist_config.users.items():
-            try:
-                user = pwd.getpwnam(username)
-            except KeyError:
-                self.fail('User {} is missing'.format(username))
-            for groupname in details['groups']:
-                try:
-                    group = grp.getgrnam(groupname)
-                except KeyError:
-                    self.fail('Group {} referenced by user {} does not exist'.format(
-                        groupname, username))
-                if group.gr_gid != user.pw_gid:
-                    self.assertIn(username, group.gr_mem, 'User {} not in group {}'.format(
-                        username, groupname))
-
-    def test_dirs(self):
-        for name, details in self.dist_config.dirs.items():
-            dirpath = self.dist_config.path(name)
-            self.assertTrue(dirpath.isdir(), 'Dir {} is missing'.format(name))
-            stat = dirpath.stat()
-            owner = pwd.getpwuid(stat.st_uid).pw_name
-            group = grp.getgrgid(stat.st_gid).gr_name
-            perms = stat.st_mode & ~0o40000
-            self.assertEqual(owner, details.get('owner', 'root'),
-                             'Dir {} ({}) has wrong owner: {}'.format(name, dirpath, owner))
-            self.assertEqual(group, details.get('group', 'root'),
-                             'Dir {} ({}) has wrong group: {}'.format(name, dirpath, group))
-            self.assertEqual(perms, details.get('perms', 0o755),
-                             'Dir {} ({}) has wrong perms: 0o{:o}'.format(name, dirpath, perms))
-
-
-if __name__ == '__main__':
-    unittest.main()

=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2015-10-06 18:23:28 +0000
@@ -0,0 +1,3 @@
+reset: false
+packages:
+  - amulet