Merge pull request #66 from ceph/wip_tune_upgrade-firefly

Changed upgrade order and re-enabled rados/tests.sh

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml

@@ -13,3 +13,6 @@ tasks:
      - workload2
      - upgrade-sequence
    - print: "**** done parallel"
+   - install.upgrade:
+       client.0:
+   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"

suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml

@@ -4,6 +4,6 @@ workload2:
       branch: firefly
       clients:
         client.0:
-#        - rados/test.sh
+        - rados/test.sh
         - cls
-  - print: "**** done #rados/test.sh (removed for now) and cls 2"
+  - print: "**** done #rados/test.sh and cls 2"

suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml

@@ -6,9 +6,6 @@ upgrade-sequence:
    - install.upgrade:
        mon.b:
    - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-   - install.upgrade:
-       client.0:
-   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
    - ceph.restart:
        daemons: [mon.a]
    - sleep:

suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml

@@ -6,9 +6,6 @@ upgrade-sequence:
    - install.upgrade:
        mon.b:
    - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-   - install.upgrade:
-       client.0:
-   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
    - ceph.restart:
        daemons: [mon.a, mon.b, mon.c]
        wait-for-healthy: true