From: Josh Durgin Date: Fri, 20 May 2016 22:31:48 +0000 (-0700) Subject: suites/teuthology/multi-cluster: make them pass again X-Git-Tag: v11.1.1~58^2^2~191^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ed9ee7a4c8c0cce357ed0c2fd7a0f0368210f3cc;p=ceph.git 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 --- diff --git a/suites/teuthology/multi-cluster/all/ceph.yaml b/suites/teuthology/multi-cluster/all/ceph.yaml index 3fa90b4633edf..6a93b9a9a4858 100644 --- 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 944184db00474..c8a742ffefc1b 100644 --- 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 index 0000000000000..4c28d731f6b45 --- /dev/null +++ b/suites/teuthology/multi-cluster/fs/xfs.yaml @@ -0,0 +1 @@ +../../../../fs/xfs.yaml \ No newline at end of file