From e672d6b29c028503a55f7985ee8177c89d2e237f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 23 Jun 2013 21:44:20 -0700 Subject: [PATCH] upgrade/fs: make single hop cuttlefish -> next (not bobtail -> next) The bobtail ceph-fuse is buggy and these tests keep failing e.g. on umount, but we don't really care about fixing the bobtail fs bugs. --- .../bobtail.yaml => 1-cuttlefish-install/cuttlefish.yaml} | 2 +- .../blogbench.yaml | 2 +- .../{2-bobtail-workload => 2-cuttlefish-workload}/dbench.yaml | 2 +- .../fs/{2-bobtail-workload => 2-cuttlefish-workload}/iogen.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename suites/upgrade/fs/{1-bobtail-install/bobtail.yaml => 1-cuttlefish-install/cuttlefish.yaml} (61%) rename suites/upgrade/fs/{2-bobtail-workload => 2-cuttlefish-workload}/blogbench.yaml (77%) rename suites/upgrade/fs/{2-bobtail-workload => 2-cuttlefish-workload}/dbench.yaml (76%) rename suites/upgrade/fs/{2-bobtail-workload => 2-cuttlefish-workload}/iogen.yaml (76%) diff --git a/suites/upgrade/fs/1-bobtail-install/bobtail.yaml b/suites/upgrade/fs/1-cuttlefish-install/cuttlefish.yaml similarity index 61% rename from suites/upgrade/fs/1-bobtail-install/bobtail.yaml rename to suites/upgrade/fs/1-cuttlefish-install/cuttlefish.yaml index f76c8410ce0e3..b62bf7a39db4a 100644 --- a/suites/upgrade/fs/1-bobtail-install/bobtail.yaml +++ b/suites/upgrade/fs/1-cuttlefish-install/cuttlefish.yaml @@ -1,5 +1,5 @@ tasks: - install: - branch: bobtail + branch: cuttlefish - ceph: - ceph-fuse: diff --git a/suites/upgrade/fs/2-bobtail-workload/blogbench.yaml b/suites/upgrade/fs/2-cuttlefish-workload/blogbench.yaml similarity index 77% rename from suites/upgrade/fs/2-bobtail-workload/blogbench.yaml rename to suites/upgrade/fs/2-cuttlefish-workload/blogbench.yaml index 830893e50d144..50161b081142b 100644 --- a/suites/upgrade/fs/2-bobtail-workload/blogbench.yaml +++ b/suites/upgrade/fs/2-cuttlefish-workload/blogbench.yaml @@ -1,6 +1,6 @@ tasks: - workunit: - branch: bobtail + branch: cuttlefish clients: client.0: - suites/blogbench.sh diff --git a/suites/upgrade/fs/2-bobtail-workload/dbench.yaml b/suites/upgrade/fs/2-cuttlefish-workload/dbench.yaml similarity index 76% rename from suites/upgrade/fs/2-bobtail-workload/dbench.yaml rename to suites/upgrade/fs/2-cuttlefish-workload/dbench.yaml index d3aac66d660db..3bb9040e251a1 100644 --- a/suites/upgrade/fs/2-bobtail-workload/dbench.yaml +++ b/suites/upgrade/fs/2-cuttlefish-workload/dbench.yaml @@ -1,6 +1,6 @@ tasks: - workunit: - branch: bobtail + branch: cuttlefish clients: all: - suites/dbench.sh diff --git a/suites/upgrade/fs/2-bobtail-workload/iogen.yaml b/suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml similarity index 76% rename from suites/upgrade/fs/2-bobtail-workload/iogen.yaml rename to suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml index 77ce8026d0d6d..c832d2f5bb1a6 100644 --- a/suites/upgrade/fs/2-bobtail-workload/iogen.yaml +++ b/suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml @@ -1,6 +1,6 @@ tasks: - workunit: - branch: bobtail + branch: cuttlefish clients: client.0: - suites/iogen.sh -- 2.39.5