Merge lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/trunk into lp:~charmers/charms/bundles/apache-core-batch-processing/bundle

[Kevin W Monroe]

fixup tests

[lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/trunk]

27. By Cory Johns on 2015-10-07

Bumped charm revisions

[Kevin W Monroe (kwmonroe)]

LGTM, +1

review: Approve

=== modified file 'bundle.yaml'
--- bundle.yaml	2015-09-16 20:23:30 +0000
+++ bundle.yaml	2015-10-07 21:00:53 +0000
@@ -1,38 +1,38 @@
 services:
   client:
-    charm: cs:trusty/apache-hadoop-client-5
+    charm: cs:trusty/apache-hadoop-client-6
     num_units: 1
     annotations:
       gui-x: "1300"
       gui-y: "200"
   compute-slave:
-    charm: cs:trusty/apache-hadoop-compute-slave-8
+    charm: cs:trusty/apache-hadoop-compute-slave-9
     num_units: 3
     annotations:
       gui-x: "250"
       gui-y: "200"
     constraints: mem=3G
   hdfs-master:
-    charm: cs:trusty/apache-hadoop-hdfs-master-8
+    charm: cs:trusty/apache-hadoop-hdfs-master-9
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "350"
     constraints: mem=7G
   plugin:
-    charm: cs:trusty/apache-hadoop-plugin-7
+    charm: cs:trusty/apache-hadoop-plugin-8
     annotations:
       gui-x: "950"
       gui-y: "200"
   secondary-namenode:
-    charm: cs:trusty/apache-hadoop-hdfs-secondary-6
+    charm: cs:trusty/apache-hadoop-hdfs-secondary-7
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "600"
     constraints: mem=7G
   yarn-master:
-    charm: cs:trusty/apache-hadoop-yarn-master-6
+    charm: cs:trusty/apache-hadoop-yarn-master-7
     num_units: 1
     annotations:
       gui-x: "600"

=== removed file 'tests/00-setup'
--- tests/00-setup	2015-10-02 20:28:04 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-to_install=''
-
-if ! dpkg -s amulet &> /dev/null; then
-    sudo add-apt-repository -y ppa:juju/stable
-    sudo apt-get update
-    to_install="$to_install amulet"
-fi
-
-if ! dpkg -s python3-yaml &> /dev/null; then
-    to_install="$to_install python3-yaml"
-fi
-
-if [[ -n "$to_install" ]]; then
-    echo Installing $to_install...
-    sudo apt-get install -y $to_install
-fi

=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2015-10-07 21:00:53 +0000
@@ -0,0 +1,4 @@
+reset: false
+packages:
+  - amulet
+  - python3-yaml