From c427818b20d373dbe989e5d7675d86c06b348d6b Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Thu, 28 Mar 2019 15:26:32 -0700 Subject: [PATCH] qa/tests added mimic-x-singleton suite to rados as symlink replaces https://github.com/ceph/ceph/pull/27131 Signed-off-by: Yuri Weinstein --- qa/suites/rados/upgrade/mimic-x-singleton | 1 + .../luminous-x-singleton => upgrade/mimic-x-singleton}/% | 0 .../luminous-x-singleton => upgrade/mimic-x-singleton}/.qa | 0 .../mimic-x-singleton}/0-cluster/+ | 0 .../mimic-x-singleton}/0-cluster/.qa | 0 .../mimic-x-singleton}/0-cluster/openstack.yaml | 0 .../mimic-x-singleton}/0-cluster/start.yaml | 0 .../mimic-x-singleton}/1-install/.qa | 0 .../mimic-x-singleton/1-install/mimic.yaml} | 6 +++--- .../mimic-x-singleton}/2-partial-upgrade/.qa | 0 .../mimic-x-singleton}/2-partial-upgrade/firsthalf.yaml | 0 .../mimic-x-singleton}/3-thrash/.qa | 0 .../mimic-x-singleton}/3-thrash/default.yaml | 0 .../mimic-x-singleton}/4-workload/+ | 0 .../mimic-x-singleton}/4-workload/.qa | 0 .../mimic-x-singleton}/4-workload/rbd-cls.yaml | 2 +- .../mimic-x-singleton}/4-workload/rbd-import-export.yaml | 2 +- .../mimic-x-singleton}/4-workload/readwrite.yaml | 0 .../mimic-x-singleton}/4-workload/snaps-few-objects.yaml | 0 .../mimic-x-singleton}/5-workload/+ | 0 .../mimic-x-singleton}/5-workload/.qa | 0 .../mimic-x-singleton}/5-workload/radosbench.yaml | 0 .../mimic-x-singleton}/5-workload/rbd_api.yaml | 2 +- .../mimic-x-singleton}/6-finish-upgrade.yaml | 0 .../mimic-x-singleton}/7-nautilus.yaml | 0 .../mimic-x-singleton}/8-workload/+ | 0 .../mimic-x-singleton}/8-workload/.qa | 0 .../mimic-x-singleton}/8-workload/rbd-python.yaml | 0 .../mimic-x-singleton}/8-workload/rgw-swift.yaml | 0 .../mimic-x-singleton}/8-workload/snaps-many-objects.yaml | 0 .../mimic-x-singleton}/supported-random-distro$ | 0 .../mimic-x-singleton}/thrashosds-health.yaml | 0 32 files changed, 7 insertions(+), 6 deletions(-) create mode 120000 qa/suites/rados/upgrade/mimic-x-singleton rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/% (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/0-cluster/+ (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/0-cluster/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/0-cluster/openstack.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/0-cluster/start.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/1-install/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton/1-install/luminous.yaml => upgrade/mimic-x-singleton/1-install/mimic.yaml} (79%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/2-partial-upgrade/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/2-partial-upgrade/firsthalf.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/3-thrash/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/3-thrash/default.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/4-workload/+ (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/4-workload/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/4-workload/rbd-cls.yaml (90%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/4-workload/rbd-import-export.yaml (92%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/4-workload/readwrite.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/4-workload/snaps-few-objects.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/5-workload/+ (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/5-workload/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/5-workload/radosbench.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/5-workload/rbd_api.yaml (89%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/6-finish-upgrade.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/7-nautilus.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/8-workload/+ (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/8-workload/.qa (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/8-workload/rbd-python.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/8-workload/rgw-swift.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/8-workload/snaps-many-objects.yaml (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/supported-random-distro$ (100%) rename qa/suites/{rados/upgrade/luminous-x-singleton => upgrade/mimic-x-singleton}/thrashosds-health.yaml (100%) diff --git a/qa/suites/rados/upgrade/mimic-x-singleton b/qa/suites/rados/upgrade/mimic-x-singleton new file mode 120000 index 00000000000..ebecaf67538 --- /dev/null +++ b/qa/suites/rados/upgrade/mimic-x-singleton @@ -0,0 +1 @@ +../../upgrade/mimic-x-singleton \ No newline at end of file diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/% b/qa/suites/upgrade/mimic-x-singleton/% similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/% rename to qa/suites/upgrade/mimic-x-singleton/% diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/.qa b/qa/suites/upgrade/mimic-x-singleton/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/.qa rename to qa/suites/upgrade/mimic-x-singleton/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+ b/qa/suites/upgrade/mimic-x-singleton/0-cluster/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+ rename to qa/suites/upgrade/mimic-x-singleton/0-cluster/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/.qa b/qa/suites/upgrade/mimic-x-singleton/0-cluster/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/.qa rename to qa/suites/upgrade/mimic-x-singleton/0-cluster/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml b/qa/suites/upgrade/mimic-x-singleton/0-cluster/openstack.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml rename to qa/suites/upgrade/mimic-x-singleton/0-cluster/openstack.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x-singleton/0-cluster/start.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml rename to qa/suites/upgrade/mimic-x-singleton/0-cluster/start.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/.qa b/qa/suites/upgrade/mimic-x-singleton/1-install/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/1-install/.qa rename to qa/suites/upgrade/mimic-x-singleton/1-install/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml similarity index 79% rename from qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml rename to qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml index ed61af0f106..b4c05363c6d 100644 --- a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml @@ -5,10 +5,10 @@ overrides: - \(MGR_DOWN\) - slow request meta: -- desc: install ceph/luminous latest +- desc: install ceph/mimic latest tasks: - install: - branch: luminous + branch: mimic exclude_packages: - librados3 - ceph-mgr-dashboard @@ -17,6 +17,6 @@ tasks: - ceph-mgr-rook - ceph-mgr-ssh extra_packages: ['librados2'] -- print: "**** done install luminous" +- print: "**** done install mimic" - ceph: - print: "**** done ceph" diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/.qa b/qa/suites/upgrade/mimic-x-singleton/2-partial-upgrade/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/.qa rename to qa/suites/upgrade/mimic-x-singleton/2-partial-upgrade/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/mimic-x-singleton/2-partial-upgrade/firsthalf.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml rename to qa/suites/upgrade/mimic-x-singleton/2-partial-upgrade/firsthalf.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/.qa b/qa/suites/upgrade/mimic-x-singleton/3-thrash/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/.qa rename to qa/suites/upgrade/mimic-x-singleton/3-thrash/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml b/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml rename to qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+ b/qa/suites/upgrade/mimic-x-singleton/4-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+ rename to qa/suites/upgrade/mimic-x-singleton/4-workload/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/.qa b/qa/suites/upgrade/mimic-x-singleton/4-workload/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/.qa rename to qa/suites/upgrade/mimic-x-singleton/4-workload/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml similarity index 90% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml rename to qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml index 1a1d5e683c7..c041555403c 100644 --- a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: luminous + branch: mimic clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml similarity index 92% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml rename to qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml index da926680f06..997f452d834 100644 --- a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: luminous + branch: mimic clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml b/qa/suites/upgrade/mimic-x-singleton/4-workload/readwrite.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml rename to qa/suites/upgrade/mimic-x-singleton/4-workload/readwrite.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/mimic-x-singleton/4-workload/snaps-few-objects.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml rename to qa/suites/upgrade/mimic-x-singleton/4-workload/snaps-few-objects.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+ b/qa/suites/upgrade/mimic-x-singleton/5-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+ rename to qa/suites/upgrade/mimic-x-singleton/5-workload/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/.qa b/qa/suites/upgrade/mimic-x-singleton/5-workload/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/5-workload/.qa rename to qa/suites/upgrade/mimic-x-singleton/5-workload/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml b/qa/suites/upgrade/mimic-x-singleton/5-workload/radosbench.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml rename to qa/suites/upgrade/mimic-x-singleton/5-workload/radosbench.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml b/qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml similarity index 89% rename from qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml rename to qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml index 3a9452ad3b8..ccfc8385f39 100644 --- a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: luminous + branch: mimic clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml b/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml rename to qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml b/qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml rename to qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+ b/qa/suites/upgrade/mimic-x-singleton/8-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+ rename to qa/suites/upgrade/mimic-x-singleton/8-workload/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/.qa b/qa/suites/upgrade/mimic-x-singleton/8-workload/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/8-workload/.qa rename to qa/suites/upgrade/mimic-x-singleton/8-workload/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rbd-python.yaml b/qa/suites/upgrade/mimic-x-singleton/8-workload/rbd-python.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rbd-python.yaml rename to qa/suites/upgrade/mimic-x-singleton/8-workload/rbd-python.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/upgrade/mimic-x-singleton/8-workload/rgw-swift.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml rename to qa/suites/upgrade/mimic-x-singleton/8-workload/rgw-swift.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/upgrade/mimic-x-singleton/8-workload/snaps-many-objects.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/8-workload/snaps-many-objects.yaml rename to qa/suites/upgrade/mimic-x-singleton/8-workload/snaps-many-objects.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/supported-random-distro$ b/qa/suites/upgrade/mimic-x-singleton/supported-random-distro$ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/supported-random-distro$ rename to qa/suites/upgrade/mimic-x-singleton/supported-random-distro$ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml b/qa/suites/upgrade/mimic-x-singleton/thrashosds-health.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml rename to qa/suites/upgrade/mimic-x-singleton/thrashosds-health.yaml -- 2.47.3