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
1=== modified file 'README.md'
2--- README.md 2015-09-22 03:44:30 +0000
3+++ README.md 2015-10-06 18:19:13 +0000
4@@ -68,7 +68,7 @@
5
6 ## Contact Information
7
8-- <bigdata-dev@lists.launchpad.net>
9+- <bigdata@lists.ubuntu.com>
10
11
12 ## Help
13
14=== modified file 'actions/restart-flume'
15--- actions/restart-flume 2015-09-17 18:51:10 +0000
16+++ actions/restart-flume 2015-10-06 18:19:13 +0000
17@@ -1,5 +1,5 @@
18 #!/bin/bash
19
20-ps -ef | grep "flume-ng" | awk '{print $2}' | xargs kill -9
21+ps -ef | grep "/usr/lib/flume-hdfs" | grep -v grep | awk '{print $2}' | xargs kill -9
22 sleep 2
23-su flume -c "/usr/lib/flume-hdfs/bin/flume-ng agent -c /etc/flume-hdfs/conf -f /etc/flume-hdfs-conf/flume.conf -n a1"
24+su flume -c "/usr/lib/flume-hdfs/bin/flume-ng agent -c /etc/flume-hdfs/conf -f /etc/flume-hdfs/conf/flume.conf -n a1"
25
26=== modified file 'actions/stop-flume'
27--- actions/stop-flume 2015-09-17 18:51:10 +0000
28+++ actions/stop-flume 2015-10-06 18:19:13 +0000
29@@ -1,3 +1,3 @@
30 #!/bin/bash
31
32-ps -ef | grep "flume-ng" | awk '{print $2}' | xargs kill -9
33+ps -ef | grep "/usr/lib/flume-hdfs" | grep -v grep | awk '{print $2}' | xargs kill -9
34
35=== modified file 'hooks/callbacks.py'
36--- hooks/callbacks.py 2015-07-28 20:18:23 +0000
37+++ hooks/callbacks.py 2015-10-06 18:19:13 +0000
38@@ -48,7 +48,7 @@
39 self.verify_resources = utils.verify_resources(*self.resources.values())
40
41 def is_installed(self):
42- return unitdata.kv().get('flume.installed')
43+ return unitdata.kv().get('flume_hdfs.installed')
44
45 def install(self, force=False):
46 if not force and self.is_installed():
47@@ -60,7 +60,7 @@
48 self.dist_config.add_dirs()
49 self.setup_flume_config()
50 self.configure_flume()
51- unitdata.kv().set('flume.installed', True)
52+ unitdata.kv().set('flume_hdfs.installed', True)
53
54 def setup_flume_config(self):
55 '''
56
57=== modified file 'resources.yaml'
58--- resources.yaml 2015-08-25 05:52:44 +0000
59+++ resources.yaml 2015-10-06 18:19:13 +0000
60@@ -7,6 +7,6 @@
61 pypi: jujubigdata>=4.0.0,<5.0.0
62 optional_resources:
63 flume-x86_64:
64- url: https://git.launchpad.net/bigdata-data/plain/apache/x86_64/apache-flume-1.6.0-bin.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0
65+ url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/apache-flume-1.6.0-bin-defd21a.tar.gz
66 hash: defd21ad8d2b6f28cc0a16b96f652099
67 hash_type: md5
68
69=== added directory 'tests'
70=== renamed directory 'tests' => 'tests.moved'
71=== renamed file 'tests/remote/test_dist_config.py' => 'tests.moved/remote/test_dist_config.py.THIS'
72=== removed file 'tests/00-setup'
73--- tests/00-setup 2015-06-09 03:21:32 +0000
74+++ tests/00-setup 1970-01-01 00:00:00 +0000
75@@ -1,5 +0,0 @@
76-#!/bin/bash
77-
78-sudo add-apt-repository ppa:juju/stable -y
79-sudo apt-get update
80-sudo apt-get install python3 amulet -y
81
82=== added file 'tests/01-basic-deployment.py'
83--- tests/01-basic-deployment.py 1970-01-01 00:00:00 +0000
84+++ tests/01-basic-deployment.py 2015-10-06 18:19:13 +0000
85@@ -0,0 +1,24 @@
86+#!/usr/bin/env python3
87+
88+import unittest
89+import amulet
90+
91+
92+class TestDeploy(unittest.TestCase):
93+ """
94+ Trivial deployment test for Apache Flume-HDFS.
95+
96+ This charm cannot do anything useful by itself, so integration testing
97+ is done in the bundle.
98+ """
99+
100+ def test_deploy(self):
101+ self.d = amulet.Deployment(series='trusty')
102+ self.d.add('flume-hdfs', 'apache-flume-hdfs')
103+ self.d.setup(timeout=900)
104+ self.d.sentry.wait(timeout=1800)
105+ self.unit = self.d.sentry['flume-hdfs'][0]
106+
107+
108+if __name__ == '__main__':
109+ unittest.main()
110
111=== added file 'tests/tests.yaml'
112--- tests/tests.yaml 1970-01-01 00:00:00 +0000
113+++ tests/tests.yaml 2015-10-06 18:19:13 +0000
114@@ -0,0 +1,3 @@
115+reset: false
116+packages:
117+ - amulet

Subscribers

People subscribed via source and target branches