From 1231a306ec49c03d92ef4e8c364972c13a9fb669 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 22 Mar 2019 14:58:46 +0800 Subject: [PATCH] qa/suites: do not test luminous-x upgrade path in this change, * suites/rados/upgrade: luminous-x-singleton => mimic-x-singleton * suites/upgrade: luminous-x => nautilus-x we support upgrade from n to n+2 release. otherwise monitor refuses to do so: mon.a@-1(probing) e1 current monmap has min_mon_release 15 (luminous) which is >2 releases older than me 15 (octopus), stopping. Fixes: https://tracker.ceph.com/issues/38845 Signed-off-by: Kefu Chai --- .../% | 0 .../.qa | 0 .../0-cluster/+ | 0 .../0-cluster/.qa | 0 .../0-cluster/openstack.yaml | 0 .../0-cluster/start.yaml | 0 .../1-install/.qa | 0 .../1-install/mimic.yaml} | 4 +-- .../2-partial-upgrade/.qa | 0 .../2-partial-upgrade/firsthalf.yaml | 0 .../3-thrash/.qa | 0 .../3-thrash/default.yaml | 0 .../4-workload/+ | 0 .../4-workload/.qa | 0 .../4-workload/rbd-cls.yaml | 0 .../4-workload/rbd-import-export.yaml | 0 .../4-workload/readwrite.yaml | 0 .../4-workload/snaps-few-objects.yaml | 0 .../5-workload/+ | 0 .../5-workload/.qa | 0 .../5-workload/radosbench.yaml | 0 .../5-workload/rbd_api.yaml | 0 .../6-finish-upgrade.yaml | 0 .../7-nautilus.yaml | 0 .../8-workload/+ | 0 .../8-workload/.qa | 0 .../8-workload/rbd-python.yaml | 0 .../8-workload/rgw-swift.yaml | 0 .../8-workload/snaps-many-objects.yaml | 0 .../supported-random-distro$ | 0 .../thrashosds-health.yaml | 0 .../stress-split/1-ceph-install/luminous.yaml | 25 ------------------- .../upgrade/{luminous-x => nautilus-x}/.qa | 0 .../{luminous-x => nautilus-x}/parallel/% | 0 .../{luminous-x => nautilus-x}/parallel/.qa | 0 .../parallel/0-cluster/+ | 0 .../parallel/0-cluster/.qa | 0 .../parallel/0-cluster/openstack.yaml | 0 .../parallel/0-cluster/start.yaml | 0 .../parallel/1-ceph-install/.qa | 0 .../parallel/1-ceph-install/nautilus.yaml} | 16 +++--------- .../1.1-pg-log-overrides/normal_pg_log.yaml | 0 .../1.1-pg-log-overrides/short_pg_log.yaml | 0 .../parallel/2-workload/+ | 0 .../parallel/2-workload/.qa | 0 .../parallel/2-workload/blogbench.yaml | 0 .../parallel/2-workload/ec-rados-default.yaml | 0 .../parallel/2-workload/rados_api.yaml | 0 .../parallel/2-workload/rados_loadgenbig.yaml | 0 .../2-workload/rgw_ragweed_prepare.yaml | 0 .../parallel/2-workload/test_rbd_api.yaml | 0 .../parallel/2-workload/test_rbd_python.yaml | 0 .../parallel/3-upgrade-sequence/.qa | 0 .../3-upgrade-sequence/upgrade-all.yaml | 0 .../upgrade-mon-osd-mds.yaml | 0 .../parallel/4-msgr2.yaml | 0 .../parallel/4-nautilus.yaml | 0 .../parallel/5-final-workload/+ | 0 .../parallel/5-final-workload/.qa | 0 .../parallel/5-final-workload/blogbench.yaml | 0 .../rados-snaps-few-objects.yaml | 0 .../5-final-workload/rados_loadgenmix.yaml | 0 .../5-final-workload/rados_mon_thrash.yaml | 0 .../parallel/5-final-workload/rbd_cls.yaml | 0 .../5-final-workload/rbd_import_export.yaml | 0 .../parallel/5-final-workload/rgw.yaml | 0 .../5-final-workload/rgw_ragweed_check.yaml | 0 .../parallel/5-final-workload/rgw_swift.yaml | 0 .../parallel/objectstore | 0 .../parallel/supported-all-distro | 0 .../stress-split-erasure-code/% | 0 .../stress-split-erasure-code/.qa | 0 .../stress-split-erasure-code/0-cluster | 0 .../1-nautilus-install} | 0 .../1.1-pg-log-overrides/normal_pg_log.yaml | 0 .../1.1-pg-log-overrides/short_pg_log.yaml | 0 .../2-partial-upgrade | 0 .../stress-split-erasure-code/3-thrash/.qa | 0 .../3-thrash/default.yaml | 0 .../4-ec-workload.yaml | 0 .../5-finish-upgrade.yaml | 0 .../7-final-workload.yaml | 0 .../stress-split-erasure-code/objectstore | 0 .../supported-all-distro | 0 .../thrashosds-health.yaml | 0 .../{luminous-x => nautilus-x}/stress-split/% | 0 .../stress-split/.qa | 0 .../stress-split/0-cluster/+ | 0 .../stress-split/0-cluster/.qa | 0 .../stress-split/0-cluster/openstack.yaml | 0 .../stress-split/0-cluster/start.yaml | 0 .../stress-split/1-ceph-install/.qa | 0 .../stress-split/1-ceph-install/nautilus.yaml | 17 +++++++++++++ .../1.1-pg-log-overrides/normal_pg_log.yaml | 0 .../1.1-pg-log-overrides/short_pg_log.yaml | 0 .../stress-split/2-partial-upgrade/.qa | 0 .../2-partial-upgrade/firsthalf.yaml | 0 .../stress-split/3-thrash/.qa | 0 .../stress-split/3-thrash/default.yaml | 0 .../stress-split/4-workload/+ | 0 .../stress-split/4-workload/.qa | 0 .../stress-split/4-workload/radosbench.yaml | 0 .../stress-split/4-workload/rbd-cls.yaml | 0 .../4-workload/rbd-import-export.yaml | 0 .../stress-split/4-workload/rbd_api.yaml | 0 .../stress-split/4-workload/readwrite.yaml | 0 .../4-workload/snaps-few-objects.yaml | 0 .../stress-split/5-finish-upgrade.yaml | 0 .../stress-split/6-msgr2.yaml | 0 .../stress-split/6-nautilus.yaml | 0 .../stress-split/7-final-workload/+ | 0 .../stress-split/7-final-workload/.qa | 0 .../7-final-workload/rbd-python.yaml | 0 .../7-final-workload/rgw-swift.yaml | 0 .../7-final-workload/snaps-many-objects.yaml | 0 .../stress-split/objectstore/.qa | 0 .../objectstore/bluestore-bitmap.yaml | 0 .../objectstore/filestore-xfs.yaml | 0 .../stress-split/supported-all-distro | 0 .../stress-split/thrashosds-health.yaml | 0 120 files changed, 23 insertions(+), 39 deletions(-) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/% (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/0-cluster/+ (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/0-cluster/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/0-cluster/openstack.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/0-cluster/start.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/1-install/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton/1-install/luminous.yaml => mimic-x-singleton/1-install/mimic.yaml} (87%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/2-partial-upgrade/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/2-partial-upgrade/firsthalf.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/3-thrash/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/3-thrash/default.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/4-workload/+ (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/4-workload/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/4-workload/rbd-cls.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/4-workload/rbd-import-export.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/4-workload/readwrite.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/4-workload/snaps-few-objects.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/5-workload/+ (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/5-workload/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/5-workload/radosbench.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/5-workload/rbd_api.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/6-finish-upgrade.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/7-nautilus.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/8-workload/+ (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/8-workload/.qa (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/8-workload/rbd-python.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/8-workload/rgw-swift.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/8-workload/snaps-many-objects.yaml (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/supported-random-distro$ (100%) rename qa/suites/rados/upgrade/{luminous-x-singleton => mimic-x-singleton}/thrashosds-health.yaml (100%) delete mode 100644 qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml rename qa/suites/upgrade/{luminous-x => nautilus-x}/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/% (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/0-cluster/+ (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/0-cluster/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/0-cluster/openstack.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/0-cluster/start.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/1-ceph-install/.qa (100%) rename qa/suites/upgrade/{luminous-x/parallel/1-ceph-install/luminous.yaml => nautilus-x/parallel/1-ceph-install/nautilus.yaml} (68%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/1.1-pg-log-overrides/normal_pg_log.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/1.1-pg-log-overrides/short_pg_log.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/+ (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/blogbench.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/ec-rados-default.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/rados_api.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/rados_loadgenbig.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/rgw_ragweed_prepare.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/test_rbd_api.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/2-workload/test_rbd_python.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/3-upgrade-sequence/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/3-upgrade-sequence/upgrade-all.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/4-msgr2.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/4-nautilus.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/+ (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/blogbench.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rados-snaps-few-objects.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rados_loadgenmix.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rados_mon_thrash.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rbd_cls.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rbd_import_export.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rgw.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rgw_ragweed_check.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/5-final-workload/rgw_swift.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/objectstore (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/parallel/supported-all-distro (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/% (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/0-cluster (100%) rename qa/suites/upgrade/{luminous-x/stress-split-erasure-code/1-luminous-install => nautilus-x/stress-split-erasure-code/1-nautilus-install} (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/2-partial-upgrade (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/3-thrash/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/3-thrash/default.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/4-ec-workload.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/5-finish-upgrade.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/7-final-workload.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/objectstore (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/supported-all-distro (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split-erasure-code/thrashosds-health.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/% (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/0-cluster/+ (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/0-cluster/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/0-cluster/openstack.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/0-cluster/start.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/1-ceph-install/.qa (100%) create mode 100644 qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/1.1-pg-log-overrides/short_pg_log.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/2-partial-upgrade/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/2-partial-upgrade/firsthalf.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/3-thrash/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/3-thrash/default.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/+ (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/radosbench.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/rbd-cls.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/rbd-import-export.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/rbd_api.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/readwrite.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/4-workload/snaps-few-objects.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/5-finish-upgrade.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/6-msgr2.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/6-nautilus.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/7-final-workload/+ (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/7-final-workload/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/7-final-workload/rbd-python.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/7-final-workload/rgw-swift.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/7-final-workload/snaps-many-objects.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/objectstore/.qa (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/objectstore/bluestore-bitmap.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/objectstore/filestore-xfs.yaml (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/supported-all-distro (100%) rename qa/suites/upgrade/{luminous-x => nautilus-x}/stress-split/thrashosds-health.yaml (100%) diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/% b/qa/suites/rados/upgrade/mimic-x-singleton/% similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/% rename to qa/suites/rados/upgrade/mimic-x-singleton/% diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/.qa b/qa/suites/rados/upgrade/mimic-x-singleton/.qa similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/.qa rename to qa/suites/rados/upgrade/mimic-x-singleton/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+ b/qa/suites/rados/upgrade/mimic-x-singleton/0-cluster/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+ rename to qa/suites/rados/upgrade/mimic-x-singleton/0-cluster/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/.qa b/qa/suites/rados/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/rados/upgrade/mimic-x-singleton/0-cluster/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml b/qa/suites/rados/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/rados/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/rados/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/rados/upgrade/mimic-x-singleton/0-cluster/start.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/.qa b/qa/suites/rados/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/rados/upgrade/mimic-x-singleton/1-install/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/1-install/mimic.yaml similarity index 87% rename from qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml rename to qa/suites/rados/upgrade/mimic-x-singleton/1-install/mimic.yaml index ed61af0f106..0a338854c55 100644 --- a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml +++ b/qa/suites/rados/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 diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/.qa b/qa/suites/rados/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/rados/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/rados/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/rados/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/rados/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/rados/upgrade/mimic-x-singleton/3-thrash/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml b/qa/suites/rados/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/rados/upgrade/mimic-x-singleton/3-thrash/default.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+ b/qa/suites/rados/upgrade/mimic-x-singleton/4-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+ rename to qa/suites/rados/upgrade/mimic-x-singleton/4-workload/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/.qa b/qa/suites/rados/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/rados/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/rados/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml rename to qa/suites/rados/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml rename to qa/suites/rados/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml b/qa/suites/rados/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/rados/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/rados/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/rados/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/rados/upgrade/mimic-x-singleton/5-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+ rename to qa/suites/rados/upgrade/mimic-x-singleton/5-workload/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/.qa b/qa/suites/rados/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/rados/upgrade/mimic-x-singleton/5-workload/.qa diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml b/qa/suites/rados/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/rados/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/rados/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml rename to qa/suites/rados/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/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/rados/upgrade/mimic-x-singleton/6-finish-upgrade.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml b/qa/suites/rados/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/rados/upgrade/mimic-x-singleton/7-nautilus.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+ b/qa/suites/rados/upgrade/mimic-x-singleton/8-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+ rename to qa/suites/rados/upgrade/mimic-x-singleton/8-workload/+ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/.qa b/qa/suites/rados/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/rados/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/rados/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/rados/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/rados/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/rados/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/rados/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/rados/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/rados/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/rados/upgrade/mimic-x-singleton/supported-random-distro$ diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml b/qa/suites/rados/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/rados/upgrade/mimic-x-singleton/thrashosds-health.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml deleted file mode 100644 index 65c4398dab9..00000000000 --- a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml +++ /dev/null @@ -1,25 +0,0 @@ -meta: -- desc: install ceph/luminous latest -tasks: -- install: - branch: luminous - exclude_packages: - - librados3 - - ceph-mgr-dashboard - - ceph-mgr-diskprediction-local - - ceph-mgr-diskprediction-cloud - - ceph-mgr-rook - - ceph-mgr-ssh - extra_packages: ['librados2'] -- print: "**** done install luminous" -- ceph: -- exec: - osd.0: - - ceph osd require-osd-release luminous - - ceph osd set-require-min-compat-client luminous -- print: "**** done ceph" -overrides: - ceph: - conf: - mon: - mon warn on osd down out interval zero: false diff --git a/qa/suites/upgrade/luminous-x/.qa b/qa/suites/upgrade/nautilus-x/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/.qa rename to qa/suites/upgrade/nautilus-x/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/% b/qa/suites/upgrade/nautilus-x/parallel/% similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/% rename to qa/suites/upgrade/nautilus-x/parallel/% diff --git a/qa/suites/upgrade/luminous-x/parallel/.qa b/qa/suites/upgrade/nautilus-x/parallel/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/.qa rename to qa/suites/upgrade/nautilus-x/parallel/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/+ b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/+ similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/0-cluster/+ rename to qa/suites/upgrade/nautilus-x/parallel/0-cluster/+ diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/.qa b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/0-cluster/.qa rename to qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/openstack.yaml b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/openstack.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/0-cluster/openstack.yaml rename to qa/suites/upgrade/nautilus-x/parallel/0-cluster/openstack.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml rename to qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/.qa b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/1-ceph-install/.qa rename to qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml similarity index 68% rename from qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml rename to qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml index 84dbc70ed67..091b17f58ea 100644 --- a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml @@ -5,16 +5,8 @@ meta: upgrade the client node tasks: - install: - branch: luminous - exclude_packages: - - librados3 - - ceph-mgr-dashboard - - ceph-mgr-diskprediction-local - - ceph-mgr-diskprediction-cloud - - ceph-mgr-rook - - ceph-mgr-ssh - extra_packages: ['librados2'] -- print: "**** done installing luminous" + branch: nautilus +- print: "**** done installing nautilus" - ceph: log-whitelist: - overall HEALTH_ @@ -35,8 +27,8 @@ tasks: mon warn on pool no app: false - exec: osd.0: - - ceph osd require-osd-release luminous - - ceph osd set-require-min-compat-client luminous + - ceph osd require-osd-release nautilus + - ceph osd set-require-min-compat-client nautilus - print: "**** done ceph" - install.upgrade: mon.a: diff --git a/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml rename to qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml rename to qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/+ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/+ similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/+ rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/+ diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/.qa b/qa/suites/upgrade/nautilus-x/parallel/2-workload/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/.qa rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/blogbench.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/blogbench.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/blogbench.yaml rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/blogbench.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/ec-rados-default.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/ec-rados-default.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/ec-rados-default.yaml rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/ec-rados-default.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_api.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/rados_api.yaml rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_loadgenbig.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_loadgenbig.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/rados_loadgenbig.yaml rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_loadgenbig.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_api.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_api.yaml rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_python.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_python.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_python.yaml rename to qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_python.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/.qa b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/.qa rename to qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml rename to qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml rename to qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml rename to qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml rename to qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/+ similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/+ diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/.qa diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/blogbench.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/blogbench.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados-snaps-few-objects.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados-snaps-few-objects.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_loadgenmix.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_loadgenmix.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_mon_thrash.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_mon_thrash.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_cls.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_cls.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_import_export.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_import_export.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_swift.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml rename to qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_swift.yaml diff --git a/qa/suites/upgrade/luminous-x/parallel/objectstore b/qa/suites/upgrade/nautilus-x/parallel/objectstore similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/objectstore rename to qa/suites/upgrade/nautilus-x/parallel/objectstore diff --git a/qa/suites/upgrade/luminous-x/parallel/supported-all-distro b/qa/suites/upgrade/nautilus-x/parallel/supported-all-distro similarity index 100% rename from qa/suites/upgrade/luminous-x/parallel/supported-all-distro rename to qa/suites/upgrade/nautilus-x/parallel/supported-all-distro diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/% b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/% similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/% rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/% diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/.qa b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/.qa rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/0-cluster b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/0-cluster similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/0-cluster rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/0-cluster diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1-luminous-install b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1-nautilus-install similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/1-luminous-install rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1-nautilus-install diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/2-partial-upgrade b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/2-partial-upgrade similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/2-partial-upgrade rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/2-partial-upgrade diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/.qa b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/.qa rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/default.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/default.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/4-ec-workload.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/4-ec-workload.yaml rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/5-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/5-finish-upgrade.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/5-finish-upgrade.yaml rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/5-finish-upgrade.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/7-final-workload.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/7-final-workload.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/7-final-workload.yaml rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/7-final-workload.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/objectstore b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/objectstore similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/objectstore rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/objectstore diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/supported-all-distro b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/supported-all-distro similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/supported-all-distro rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/supported-all-distro diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/thrashosds-health.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/thrashosds-health.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split-erasure-code/thrashosds-health.yaml rename to qa/suites/upgrade/nautilus-x/stress-split-erasure-code/thrashosds-health.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/% b/qa/suites/upgrade/nautilus-x/stress-split/% similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/% rename to qa/suites/upgrade/nautilus-x/stress-split/% diff --git a/qa/suites/upgrade/luminous-x/stress-split/.qa b/qa/suites/upgrade/nautilus-x/stress-split/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/+ b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/+ similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/0-cluster/+ rename to qa/suites/upgrade/nautilus-x/stress-split/0-cluster/+ diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/.qa b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/0-cluster/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/0-cluster/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/openstack.yaml b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/openstack.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/0-cluster/openstack.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/0-cluster/openstack.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/start.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/0-cluster/start.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/.qa b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/.qa diff --git a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml new file mode 100644 index 00000000000..059642500c5 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml @@ -0,0 +1,17 @@ +meta: +- desc: install ceph/nautilus latest +tasks: +- install: + branch: nautilus +- print: "**** done install nautilus" +- ceph: +- exec: + osd.0: + - ceph osd require-osd-release nautilus + - ceph osd set-require-min-compat-client nautilus +- print: "**** done ceph" +overrides: + ceph: + conf: + mon: + mon warn on osd down out interval zero: false diff --git a/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/.qa b/qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/firsthalf.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/firsthalf.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/3-thrash/.qa b/qa/suites/upgrade/nautilus-x/stress-split/3-thrash/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/3-thrash/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/3-thrash/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/nautilus-x/stress-split/3-thrash/default.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/3-thrash/default.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/+ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/+ similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/+ rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/+ diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/.qa b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/radosbench.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/radosbench.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/radosbench.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/radosbench.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-cls.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-import-export.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd_api.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd_api.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/readwrite.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/readwrite.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/readwrite.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/readwrite.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/snaps-few-objects.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/4-workload/snaps-few-objects.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/4-workload/snaps-few-objects.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-msgr2.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/6-msgr2.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-nautilus.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/6-nautilus.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/+ b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/+ similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/7-final-workload/+ rename to qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/+ diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/.qa b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/7-final-workload/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rbd-python.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/snaps-many-objects.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/7-final-workload/snaps-many-objects.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/snaps-many-objects.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/objectstore/.qa b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/.qa similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/objectstore/.qa rename to qa/suites/upgrade/nautilus-x/stress-split/objectstore/.qa diff --git a/qa/suites/upgrade/luminous-x/stress-split/objectstore/bluestore-bitmap.yaml b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/bluestore-bitmap.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/objectstore/bluestore-bitmap.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/objectstore/bluestore-bitmap.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/objectstore/filestore-xfs.yaml b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/filestore-xfs.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/objectstore/filestore-xfs.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/objectstore/filestore-xfs.yaml diff --git a/qa/suites/upgrade/luminous-x/stress-split/supported-all-distro b/qa/suites/upgrade/nautilus-x/stress-split/supported-all-distro similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/supported-all-distro rename to qa/suites/upgrade/nautilus-x/stress-split/supported-all-distro diff --git a/qa/suites/upgrade/luminous-x/stress-split/thrashosds-health.yaml b/qa/suites/upgrade/nautilus-x/stress-split/thrashosds-health.yaml similarity index 100% rename from qa/suites/upgrade/luminous-x/stress-split/thrashosds-health.yaml rename to qa/suites/upgrade/nautilus-x/stress-split/thrashosds-health.yaml -- 2.47.3