From 3f19ed490836e53f2178ed6e29497bed33f80577 Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yuri.weinstein@inktank.com>
Date: Thu, 30 Apr 2015 14:18:10 -0700
Subject: [PATCH] All changes from
 https://github.com/ceph/ceph-qa-suite/commit/3ce379a689440ce084b2df79db59dd76e1b2db6c

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
---
 .../cfuse_workunit_suites_blogbench.yaml      | 19 +++++++++---------
 .../rados/tasks/rados_api_tests.yaml          | 18 ++++++++---------
 .../rbd/tasks/rbd_python_api_tests.yaml       | 18 ++++++++---------
 .../ceph-deploy/singleton/all/basic-test.yaml | 20 ++++++++-----------
 4 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
index ee35e1a56c870..549ad9e9d66b1 100644
--- a/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
+++ b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -11,25 +11,24 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - osd.3
-  - osd.4
-  - osd.5
+- - osd.1
+  - mon.b
 - - mon.c
-  - osd.6
-  - osd.7
-  - osd.8
-- - client.0
+  - osd.2
+  - client.0
 tasks:
 - install:
      extras: yes
+- print: "**** done install extras"
 - ssh_keys:
+- print: "**** done ssh_keys"
 - ceph-deploy:
+- print: "**** done ceph-deploy"
 - ceph-fuse:
+- print: "**** done ceph-fuse"
 - workunit:
      clients:
         client.0:
            - suites/blogbench.sh
+- print: "**** done suites/blogbench.sh"
 exclude_arch: armv7l
diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
index 32baa730f73c0..13d05fa65f33a 100644
--- a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
+++ b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
@@ -11,23 +11,21 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - osd.3
-  - osd.4
-  - osd.5
+- - osd.1
+  - mon.b
 - - mon.c
-  - osd.6
-  - osd.7
-  - osd.8
-- - client.0
+  - osd.2
+  - client.0
 tasks:
 - install:
      extras: yes
+- print: "**** done install extras"
 - ssh_keys:
+- print: "**** done ssh_keys"
 - ceph-deploy:
+- print: "**** done ceph-deploy"
 - workunit:
      clients:
         client.0:
            - rados/test.sh
+- print: "**** done rados/test.sh"
diff --git a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
index 9c663f5386422..89cf1acea4319 100644
--- a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
+++ b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml
@@ -11,23 +11,21 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - osd.3
-  - osd.4
-  - osd.5
+- - osd.1
+  - mon.b
 - - mon.c
-  - osd.6
-  - osd.7
-  - osd.8
-- - client.0
+  - osd.2
+  - client.0
 tasks:
 - install:
      extras: yes
+- print: "**** done install extras"
 - ssh_keys:
+- print: "**** done ssh_keys"
 - ceph-deploy:
+- print: "**** done ceph-deploy"
 - workunit:
      clients:
         client.0:
            - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh"
diff --git a/suites/ceph-deploy/singleton/all/basic-test.yaml b/suites/ceph-deploy/singleton/all/basic-test.yaml
index 14711d05856cb..a03db6f4dbd01 100644
--- a/suites/ceph-deploy/singleton/all/basic-test.yaml
+++ b/suites/ceph-deploy/singleton/all/basic-test.yaml
@@ -11,25 +11,21 @@ roles:
 - - mon.a
   - mds.0
   - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - osd.3
-  - osd.4
-  - osd.5
+- - osd.1
+  - mon.b
 - - mon.c
-  - osd.6
-  - osd.7
-  - osd.8
-- - client.0
-
+  - osd.2
+  - client.0
 tasks:
 - install:
      extras: yes
+- print: "**** done install extras"
 - ssh_keys:
+- print: "**** done ssh_keys"
 - ceph-deploy:
+- print: "**** done ceph-deploy"
 - workunit:
      clients:
         client.0:
            - suites/blogbench.sh
-
+- print: "**** done suites/blogbench.sh"
-- 
2.39.5