test: update java tests

Add additional packages to be installed
for the java tests. This is required
  due to recent changes to teuthology.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Sam Lang <sam.lang@inktank.com>

diff --git a/suites/fs/basic/tasks/libcephfs_java.yaml b/suites/fs/basic/tasks/libcephfs_java.yaml
index a19781a45836cba20b09d21fc3d874bb4da5f06c..0e11c14ac4cd6c1cb67482401a5af1e08d71f1e9 100644 (file)
--- a/suites/fs/basic/tasks/libcephfs_java.yaml
+++ b/suites/fs/basic/tasks/libcephfs_java.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni]
+
 tasks:
 - install:
 - ceph:

diff --git a/suites/hadoop/basic/tasks/wordcount.yaml b/suites/hadoop/basic/tasks/wordcount.yaml
index f8ff4d163980b71f8a9cf810820766e55d1b1bb5..d978cefa221050c17cee341f1726c1200b89493b 100644 (file)
--- a/suites/hadoop/basic/tasks/wordcount.yaml
+++ b/suites/hadoop/basic/tasks/wordcount.yaml
@@ -1,14 +1,12 @@
+overrides:
+  ceph:
+    extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni]
+
 tasks:
 - ssh_keys:
 - install:
 - ceph:
 - hadoop:
-- pexec: 
-    hadoop.slave.0:
-      - mkdir -p /tmp/hadoop_input
-      - wget http://ceph.com/qa/hadoop_input_files.tar -O /tmp/hadoop_input/files.tar
-      - cd /tmp/hadoop_input/; tar -xf /tmp/hadoop_input/files.tar
-      - /tmp/cephtest/hadoop/bin/hadoop fs -mkdir wordcount_input
-      - /tmp/cephtest/hadoop/bin/hadoop fs -put /tmp/hadoop_input/*txt wordcount_input/
-      - /tmp/cephtest/hadoop/bin/hadoop jar /tmp/cephtest/hadoop/build/hadoop-example*jar wordcount wordcount_input wordcount_output
-      - rm -rf /tmp/hadoop_input
+- workunit: 
+    clients:
+      client.0: [hadoop-wordcount]