From: Greg Farnum <greg@gregs42.com>
Date: Wed, 28 Jan 2015 19:16:35 +0000 (-0800)
Subject: do not try and install libcephfs-java via extra_packages
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95c176d7571cd52f344e51707e8df0382cea18dc;p=ceph.git

do not try and install libcephfs-java via extra_packages

It's been added to the default install task, because the
package name varies across distros.

Fixes: #10510

Signed-off-by: Greg Farnum <greg@gregs42.com>
(cherry picked from commit 30e5f3d93192a6bf2428ea4f8d793e2a087a5353)
---

diff --git a/suites/fs/basic/tasks/libcephfs_java.yaml b/suites/fs/basic/tasks/libcephfs_java.yaml
index 5d6bb00048f..d314da727e1 100644
--- a/suites/fs/basic/tasks/libcephfs_java.yaml
+++ b/suites/fs/basic/tasks/libcephfs_java.yaml
@@ -1,7 +1,7 @@
 overrides:
   install:
     ceph:
-      extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni]
+      extra_packages: [libcephfs1, libcephfs-jni]
 tasks:
 - ceph-fuse:
 - workunit:
diff --git a/suites/hadoop/basic/tasks/hadoop-internal.yaml b/suites/hadoop/basic/tasks/hadoop-internal.yaml
index d131415aa12..bf0c4092631 100644
--- a/suites/hadoop/basic/tasks/hadoop-internal.yaml
+++ b/suites/hadoop/basic/tasks/hadoop-internal.yaml
@@ -1,7 +1,7 @@
 overrides:
   install:
     ceph:
-      extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni]
+      extra_packages: [libcephfs1, libcephfs-jni]
 
 tasks:
 - ssh_keys:
diff --git a/suites/hadoop/basic/tasks/wordcount.yaml b/suites/hadoop/basic/tasks/wordcount.yaml
index bea6cb7623c..9d5ede7ffc9 100644
--- a/suites/hadoop/basic/tasks/wordcount.yaml
+++ b/suites/hadoop/basic/tasks/wordcount.yaml
@@ -1,7 +1,7 @@
 overrides:
   install:
     ceph:
-      extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni]
+      extra_packages: [libcephfs1, libcephfs-jni]
 
 tasks:
 - ssh_keys:
diff --git a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
index 5d6bb00048f..d314da727e1 100644
--- a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
+++ b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
@@ -1,7 +1,7 @@
 overrides:
   install:
     ceph:
-      extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni]
+      extra_packages: [libcephfs1, libcephfs-jni]
 tasks:
 - ceph-fuse:
 - workunit: