From bcf7eabc5f0bcd0c6665bc047c076925fbc9bdf5 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Fri, 27 Feb 2015 16:09:30 -0800 Subject: [PATCH] Changed suite name from multi-versions to client-upgrade Moved it under upgrades Replaced rbd workunit Signed-off-by: Yuri Weinstein --- .../client-upgrade}/dumpling-x/basic/% | 0 .../client-upgrade}/dumpling-x/basic/0-cluster/start.yaml | 0 .../client-upgrade}/dumpling-x/basic/1-install/dumpling-x.yaml | 0 .../dumpling-x/basic/2-workload/rados_loadgen_big.yaml | 0 .../dumpling-x/basic/2-workload/rbd_import_export.yaml} | 2 +- .../{multi-version => upgrade/client-upgrade}/firefly-x/basic/% | 0 .../client-upgrade}/firefly-x/basic/0-cluster/start.yaml | 0 .../client-upgrade}/firefly-x/basic/1-install/firefly-x.yaml | 0 .../firefly-x/basic/2-workload/rados_snap_many_objects.yaml | 0 .../firefly-x/basic/2-workload/rbd_cli_import_export.yaml | 0 .../client-upgrade}/firefly-x/basic/2-workload/rgw_swift.yaml | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename suites/{multi-version => upgrade/client-upgrade}/dumpling-x/basic/% (100%) rename suites/{multi-version => upgrade/client-upgrade}/dumpling-x/basic/0-cluster/start.yaml (100%) rename suites/{multi-version => upgrade/client-upgrade}/dumpling-x/basic/1-install/dumpling-x.yaml (100%) rename suites/{multi-version => upgrade/client-upgrade}/dumpling-x/basic/2-workload/rados_loadgen_big.yaml (100%) rename suites/{multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml => upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml} (70%) rename suites/{multi-version => upgrade/client-upgrade}/firefly-x/basic/% (100%) rename suites/{multi-version => upgrade/client-upgrade}/firefly-x/basic/0-cluster/start.yaml (100%) rename suites/{multi-version => upgrade/client-upgrade}/firefly-x/basic/1-install/firefly-x.yaml (100%) rename suites/{multi-version => upgrade/client-upgrade}/firefly-x/basic/2-workload/rados_snap_many_objects.yaml (100%) rename suites/{multi-version => upgrade/client-upgrade}/firefly-x/basic/2-workload/rbd_cli_import_export.yaml (100%) rename suites/{multi-version => upgrade/client-upgrade}/firefly-x/basic/2-workload/rgw_swift.yaml (100%) diff --git a/suites/multi-version/dumpling-x/basic/% b/suites/upgrade/client-upgrade/dumpling-x/basic/% similarity index 100% rename from suites/multi-version/dumpling-x/basic/% rename to suites/upgrade/client-upgrade/dumpling-x/basic/% diff --git a/suites/multi-version/dumpling-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml similarity index 100% rename from suites/multi-version/dumpling-x/basic/0-cluster/start.yaml rename to suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml similarity index 100% rename from suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml rename to suites/upgrade/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml diff --git a/suites/multi-version/dumpling-x/basic/2-workload/rados_loadgen_big.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml similarity index 100% rename from suites/multi-version/dumpling-x/basic/2-workload/rados_loadgen_big.yaml rename to suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml diff --git a/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml similarity index 70% rename from suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml rename to suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml index f079d351589bc..197ca4189a1c6 100644 --- a/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml +++ b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml @@ -3,4 +3,4 @@ tasks: branch: dumpling clients: client.0: - - cls/test_cls_rbd.sh + - rbd/import_export.sh diff --git a/suites/multi-version/firefly-x/basic/% b/suites/upgrade/client-upgrade/firefly-x/basic/% similarity index 100% rename from suites/multi-version/firefly-x/basic/% rename to suites/upgrade/client-upgrade/firefly-x/basic/% diff --git a/suites/multi-version/firefly-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml similarity index 100% rename from suites/multi-version/firefly-x/basic/0-cluster/start.yaml rename to suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml diff --git a/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml similarity index 100% rename from suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml rename to suites/upgrade/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml diff --git a/suites/multi-version/firefly-x/basic/2-workload/rados_snap_many_objects.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rados_snap_many_objects.yaml similarity index 100% rename from suites/multi-version/firefly-x/basic/2-workload/rados_snap_many_objects.yaml rename to suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rados_snap_many_objects.yaml diff --git a/suites/multi-version/firefly-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml similarity index 100% rename from suites/multi-version/firefly-x/basic/2-workload/rbd_cli_import_export.yaml rename to suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml diff --git a/suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rgw_swift.yaml similarity index 100% rename from suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml rename to suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rgw_swift.yaml -- 2.39.5