From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Nov 2014 17:51:20 +0000 (-0800)
Subject: fs/multiclient: force mpi tests onto trusty
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50e56e9ee2e615fa11c611c80be9a417d44eccf6;p=ceph.git

fs/multiclient: force mpi tests onto trusty

This will ensure we have a matching version of MPI.

Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 0a88b34ba350b9eb057a735fe8082ebf03762327)
---

diff --git a/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled b/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled
index 255a68795c92..e486c44c51e2 100644
--- a/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled
+++ b/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled
@@ -1,3 +1,7 @@
+# make sure we get the same MPI version on all hosts
+os_type: ubuntu
+os_version: "14.04"
+
 tasks:
 - pexec:
     clients:
diff --git a/suites/fs/multiclient/tasks/ior-shared-file.yaml b/suites/fs/multiclient/tasks/ior-shared-file.yaml
index 56795781d71f..dcf24247a925 100644
--- a/suites/fs/multiclient/tasks/ior-shared-file.yaml
+++ b/suites/fs/multiclient/tasks/ior-shared-file.yaml
@@ -1,3 +1,7 @@
+# make sure we get the same MPI version on all hosts
+os_type: ubuntu
+os_version: "14.04"
+
 tasks:
 - pexec:
     clients:
diff --git a/suites/fs/multiclient/tasks/mdtest.yaml b/suites/fs/multiclient/tasks/mdtest.yaml
index 0d1aee08b404..1dd95d954fbb 100644
--- a/suites/fs/multiclient/tasks/mdtest.yaml
+++ b/suites/fs/multiclient/tasks/mdtest.yaml
@@ -1,3 +1,7 @@
+# make sure we get the same MPI version on all hosts
+os_type: ubuntu
+os_version: "14.04"
+
 tasks:
 - pexec:
     clients: