From: Kefu Chai <kchai@redhat.com>
Date: Mon, 4 Dec 2017 04:39:50 +0000 (+0800)
Subject: qa/suites/fs: use ubuntu_latest for libcephfs_java
X-Git-Tag: v13.0.1~3^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4ec785b94551805bb215515391bcb945559dce7b;p=ceph-ci.git

qa/suites/fs: use ubuntu_latest for libcephfs_java

* instead of using ubuntu 14.04, use ubuntu_latest.since we want
  to drop the support of this release.
* refactor this test to use the facet of ubuntu_latest.yaml.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit aa89bb2f93a0ee7b26dff3972f09c64529054744)
---

diff --git a/qa/distros/supported/ubuntu_14.04.yaml b/qa/distros/supported/ubuntu_14.04.yaml
deleted file mode 120000
index cf7fff7a866..00000000000
--- a/qa/distros/supported/ubuntu_14.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/ubuntu_14.04.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml
deleted file mode 100644
index aaffa033811..00000000000
--- a/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-os_type: ubuntu
-os_version: "14.04"
-
-overrides:
-  ceph-fuse:
-    disabled: true
-  kclient:
-    disabled: true
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs-java/test.sh
diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_java/libcephfs_java.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_java/libcephfs_java.yaml
new file mode 100644
index 00000000000..6c5d874400e
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/libcephfs_java/libcephfs_java.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph-fuse:
+    disabled: true
+  kclient:
+    disabled: true
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - libcephfs-java/test.sh
diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml
new file mode 120000
index 00000000000..cc5b15bccc7
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/supported/ubuntu_latest.yaml
\ No newline at end of file