Juju Charms Collection
apache-flume-hdfs package

Merge lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk into lp:charms/trusty/apache-flume-hdfs

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Cory Johns
Status: Merged
Merged at revision: 4
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk
Merge into: lp:charms/trusty/apache-flume-hdfs
Diff against target: 117 lines (+34/-12) (has conflicts)
8 files modified
README.md (+1/-1)
actions/restart-flume (+2/-2)
actions/stop-flume (+1/-1)
hooks/callbacks.py (+2/-2)
resources.yaml (+1/-1)
tests/00-setup (+0/-5)
tests/01-basic-deployment.py (+24/-0)
tests/tests.yaml (+3/-0)
Conflict adding files to tests.  Moved to root.
Path conflict: tests / <deleted>
Conflict: can't delete tests.moved because it is not empty.  Not deleting.
Conflict adding file tests.  Moved existing file to tests.moved.
Conflict because tests.moved is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete tests.moved/remote because it is not empty.  Not deleting.
Conflict because tests.moved/remote is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tests.moved/remote/test_dist_config.py
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+273433@code.launchpad.net

Description of the change

Remove trivial test in favor of bundle tests.

To post a comment you must log in.
lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk updated
28. By Cory Johns

Re-added trivial test

29. By Cory Johns

Switch to S3 for flume binaries

30. By Cory Johns

Update mailing list

Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README.md'
--- README.md 2015-09-22 03:44:30 +0000
+++ README.md 2015-10-06 18:19:13 +0000
@@ -68,7 +68,7 @@
6868
69## Contact Information69## Contact Information
7070
71- <bigdata-dev@lists.launchpad.net>71- <bigdata@lists.ubuntu.com>
7272
7373
74## Help74## Help
7575
=== modified file 'actions/restart-flume'
--- actions/restart-flume 2015-09-17 18:51:10 +0000
+++ actions/restart-flume 2015-10-06 18:19:13 +0000
@@ -1,5 +1,5 @@
1#!/bin/bash1#!/bin/bash
22
3ps -ef | grep "flume-ng" | awk '{print $2}' | xargs kill -93ps -ef | grep "/usr/lib/flume-hdfs" | grep -v grep | awk '{print $2}' | xargs kill -9
4sleep 24sleep 2
5su flume -c "/usr/lib/flume-hdfs/bin/flume-ng agent -c /etc/flume-hdfs/conf -f /etc/flume-hdfs-conf/flume.conf -n a1"5su flume -c "/usr/lib/flume-hdfs/bin/flume-ng agent -c /etc/flume-hdfs/conf -f /etc/flume-hdfs/conf/flume.conf -n a1"
66
=== modified file 'actions/stop-flume'
--- actions/stop-flume 2015-09-17 18:51:10 +0000
+++ actions/stop-flume 2015-10-06 18:19:13 +0000
@@ -1,3 +1,3 @@
1#!/bin/bash1#!/bin/bash
22
3ps -ef | grep "flume-ng" | awk '{print $2}' | xargs kill -93ps -ef | grep "/usr/lib/flume-hdfs" | grep -v grep | awk '{print $2}' | xargs kill -9
44
=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py 2015-07-28 20:18:23 +0000
+++ hooks/callbacks.py 2015-10-06 18:19:13 +0000
@@ -48,7 +48,7 @@
48 self.verify_resources = utils.verify_resources(*self.resources.values())48 self.verify_resources = utils.verify_resources(*self.resources.values())
4949
50 def is_installed(self):50 def is_installed(self):
51 return unitdata.kv().get('flume.installed')51 return unitdata.kv().get('flume_hdfs.installed')
5252
53 def install(self, force=False):53 def install(self, force=False):
54 if not force and self.is_installed():54 if not force and self.is_installed():
@@ -60,7 +60,7 @@
60 self.dist_config.add_dirs()60 self.dist_config.add_dirs()
61 self.setup_flume_config()61 self.setup_flume_config()
62 self.configure_flume()62 self.configure_flume()
63 unitdata.kv().set('flume.installed', True)63 unitdata.kv().set('flume_hdfs.installed', True)
6464
65 def setup_flume_config(self):65 def setup_flume_config(self):
66 '''66 '''
6767
=== modified file 'resources.yaml'
--- resources.yaml 2015-08-25 05:52:44 +0000
+++ resources.yaml 2015-10-06 18:19:13 +0000
@@ -7,6 +7,6 @@
7 pypi: jujubigdata>=4.0.0,<5.0.07 pypi: jujubigdata>=4.0.0,<5.0.0
8optional_resources:8optional_resources:
9 flume-x86_64:9 flume-x86_64:
10 url: https://git.launchpad.net/bigdata-data/plain/apache/x86_64/apache-flume-1.6.0-bin.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab010 url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/apache-flume-1.6.0-bin-defd21a.tar.gz
11 hash: defd21ad8d2b6f28cc0a16b96f65209911 hash: defd21ad8d2b6f28cc0a16b96f652099
12 hash_type: md512 hash_type: md5
1313
=== added directory 'tests'
=== renamed directory 'tests' => 'tests.moved'
=== renamed file 'tests/remote/test_dist_config.py' => 'tests.moved/remote/test_dist_config.py.THIS'
=== removed file 'tests/00-setup'
--- tests/00-setup 2015-06-09 03:21:32 +0000
+++ tests/00-setup 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1#!/bin/bash
2
3sudo add-apt-repository ppa:juju/stable -y
4sudo apt-get update
5sudo apt-get install python3 amulet -y
60
=== 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:19:13 +0000
@@ -0,0 +1,24 @@
1#!/usr/bin/env python3
2
3import unittest
4import amulet
5
6
7class TestDeploy(unittest.TestCase):
8 """
9 Trivial deployment test for Apache Flume-HDFS.
10
11 This charm cannot do anything useful by itself, so integration testing
12 is done in the bundle.
13 """
14
15 def test_deploy(self):
16 self.d = amulet.Deployment(series='trusty')
17 self.d.add('flume-hdfs', 'apache-flume-hdfs')
18 self.d.setup(timeout=900)
19 self.d.sentry.wait(timeout=1800)
20 self.unit = self.d.sentry['flume-hdfs'][0]
21
22
23if __name__ == '__main__':
24 unittest.main()
025
=== added file 'tests/tests.yaml'
--- tests/tests.yaml 1970-01-01 00:00:00 +0000
+++ tests/tests.yaml 2015-10-06 18:19:13 +0000
@@ -0,0 +1,3 @@
1reset: false
2packages:
3 - amulet

Subscribers

People subscribed via source and target branches