suites/teuthology/multi-cluster: make them pass again

Use xfs to avoid object length limits and be explicit about which
clients to run on, so the workunit git clone doesn't race with another
client on the same machine.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/suites/teuthology/multi-cluster/all/ceph.yaml b/suites/teuthology/multi-cluster/all/ceph.yaml
index 3fa90b4633edf9d3c2a9a18a1fca19f074f03498..6a93b9a9a48581b66fa45168eeca903f74a40c6f 100644 (file)
--- a/suites/teuthology/multi-cluster/all/ceph.yaml
+++ b/suites/teuthology/multi-cluster/all/ceph.yaml
@@ -19,4 +19,5 @@ tasks:
 - ceph:
 - workunit:
     clients:
-      all: [true.sh]
+      ceph.client.0: [true.sh]
+      backup.client.0: [true.sh]

diff --git a/suites/teuthology/multi-cluster/all/upgrade.yaml b/suites/teuthology/multi-cluster/all/upgrade.yaml
index 944184db00474cc4dc408c8f12e49acce509b54b..c8a742ffefc1b027517f0bc4536bfad7e7e4a684 100644 (file)
--- a/suites/teuthology/multi-cluster/all/upgrade.yaml
+++ b/suites/teuthology/multi-cluster/all/upgrade.yaml
@@ -27,7 +27,8 @@ tasks:
 - ceph:
 - workunit:
     clients:
-      all: [true.sh]
+      backup.client.0: [true.sh]
+      ceph.client.0: [true.sh]
 - install.upgrade:
     ceph.mon.a:
       branch: jewel

diff --git a/suites/teuthology/multi-cluster/fs/xfs.yaml b/suites/teuthology/multi-cluster/fs/xfs.yaml
new file mode 120000 (symlink)
index 0000000..4c28d73
--- /dev/null
+++ b/suites/teuthology/multi-cluster/fs/xfs.yaml
@@ -0,0 +1 @@
+../../../../fs/xfs.yaml
\ No newline at end of file