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

Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 46
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-hive/trunk
Merge into: lp:charms/trusty/apache-hive
Diff against target: 58 lines (+13/-10)
2 files modified
tests/00-setup (+6/-3)
tests/100-deploy-hive-mysql (+7/-7)
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/apache-hive/trunk
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+271389@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kevin W Monroe (kwmonroe) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/common.py' (properties changed: +x to -x)
2=== added file 'resources/python/jujuresources-0.2.11.tar.gz'
3Binary files resources/python/jujuresources-0.2.11.tar.gz 1970-01-01 00:00:00 +0000 and resources/python/jujuresources-0.2.11.tar.gz 2015-09-16 21:44:12 +0000 differ
4=== removed file 'resources/python/jujuresources-0.2.9.tar.gz'
5Binary files resources/python/jujuresources-0.2.9.tar.gz 2015-06-29 20:48:56 +0000 and resources/python/jujuresources-0.2.9.tar.gz 1970-01-01 00:00:00 +0000 differ
6=== modified file 'tests/00-setup'
7--- tests/00-setup 2015-02-21 01:53:08 +0000
8+++ tests/00-setup 2015-09-16 21:44:12 +0000
9@@ -1,5 +1,8 @@
10 #!/bin/bash
11
12-sudo add-apt-repository ppa:juju/stable -y
13-sudo apt-get update
14-sudo apt-get install python3 amulet -y
15+if ! dpkg -s amulet &> /dev/null; then
16+ echo Installing Amulet...
17+ sudo add-apt-repository -y ppa:juju/stable
18+ sudo apt-get update
19+ sudo apt-get -y install amulet
20+fi
21
22=== modified file 'tests/100-deploy-hive-mysql'
23--- tests/100-deploy-hive-mysql 2015-08-24 23:23:36 +0000
24+++ tests/100-deploy-hive-mysql 2015-09-16 21:44:12 +0000
25@@ -1,4 +1,4 @@
26-#!/usr/bin/python3
27+#!/usr/bin/env python3
28 import unittest
29 import amulet
30
31@@ -13,10 +13,10 @@
32 def setUpClass(cls):
33 cls.d = amulet.Deployment(series='trusty')
34 # Deploy a hadoop cluster
35- cls.d.add('yarn-master', charm='cs:~bigdata-dev/trusty/apache-hadoop-yarn-master')
36- cls.d.add('hdfs-master', charm='cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master')
37- cls.d.add('compute-slave', charm='cs:~bigdata-dev/trusty/apache-hadoop-compute-slave', units=3)
38- cls.d.add('plugin', charm='cs:~bigdata-dev/trusty/apache-hadoop-plugin')
39+ cls.d.add('yarn-master', charm='cs:trusty/apache-hadoop-yarn-master')
40+ cls.d.add('hdfs-master', charm='cs:trusty/apache-hadoop-hdfs-master')
41+ cls.d.add('compute-slave', charm='cstrusty/apache-hadoop-compute-slave', units=3)
42+ cls.d.add('plugin', charm='cs:trusty/apache-hadoop-plugin')
43 cls.d.relate('yarn-master:namenode', 'hdfs-master:namenode')
44 cls.d.relate('compute-slave:nodemanager', 'yarn-master:nodemanager')
45 cls.d.relate('compute-slave:datanode', 'hdfs-master:datanode')
46@@ -28,12 +28,12 @@
47 cls.d.configure('mysql', {'binlog-format': 'row'})
48
49 # Add Hive service
50- cls.d.add('hive', charm='cs:~bigdata-dev/trusty/apache-hive')
51+ cls.d.add('hive', charm='cs:trusty/apache-hive')
52 cls.d.relate('hive:db', 'mysql:db')
53 cls.d.relate('hive:hadoop-plugin', 'plugin:hadoop-plugin')
54
55 cls.d.setup(timeout=3600)
56- cls.d.sentry.wait()
57+ cls.d.sentry.wait(timeout=3600)
58 cls.unit = cls.d.sentry.unit['hive/0']
59
60

Subscribers

People subscribed via source and target branches