diff --git a/qa/releases/mimic.yaml b/qa/releases/mimic.yaml new file mode 100644 index 00000000000..f901e7edad7 --- /dev/null +++ b/qa/releases/mimic.yaml @@ -0,0 +1,6 @@ +tasks: +- exec: + osd.0: + - ceph osd require-osd-release mimic + - ceph osd set-require-min-compat-client mimic +- ceph.healthy: diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml deleted file mode 100644 index 31ca3e50204..00000000000 --- a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml +++ /dev/null @@ -1,13 +0,0 @@ -meta: -- desc: install ceph/jewel latest -tasks: -- install: - branch: jewel - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] -- print: "**** done install jewel" -- ceph: - skip_mgr_daemons: true - add_osds_to_crush: true - log-whitelist: - - required past_interval bounds are empty -- print: "**** done ceph" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml deleted file mode 120000 index 5283ac73e1b..00000000000 --- a/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../releases/luminous.yaml \ No newline at end of file diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/% b/qa/suites/rados/upgrade/luminous-x-singleton/% similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/% rename to qa/suites/rados/upgrade/luminous-x-singleton/% diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/+ b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+ similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/+ rename to qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+ diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml similarity index 69% rename from qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml index 2872225e993..0d378dc88be 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml @@ -1,13 +1,10 @@ meta: - desc: | Run ceph on two nodes, - with a separate client-only node. + with a separate client-only node. Use xfs beneath the osds. overrides: ceph: - conf: - mon: - mon warn on legacy crush tunables: false fs: xfs roles: - - mon.a diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml new file mode 100644 index 00000000000..a296ad7459b --- /dev/null +++ b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml @@ -0,0 +1,8 @@ +meta: +- desc: install ceph/luminous latest +tasks: +- install: + branch: luminous +- print: "**** done install luminous" +- ceph: +- print: "**** done ceph" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml similarity index 96% rename from qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml index c2449164bca..466a9208cdd 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml @@ -5,7 +5,7 @@ meta: restart : osd.0,1,2,3,4,5 tasks: - install.upgrade: - osd.0: + osd.0: - print: "**** done install.upgrade osd.0" - ceph.restart: daemons: [mon.a, mon.b, mon.c] diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml similarity index 75% rename from qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml index ecf3d1bf3bb..c70aa7b7b60 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml @@ -17,8 +17,4 @@ split_tasks: timeout: 1200 chance_pgnum_grow: 1 chance_pgpnum_fix: 1 - chance_thrash_cluster_full: 0 - chance_thrash_pg_upmap: 0 - chance_thrash_pg_upmap_items: 0 - chance_force_recovery: 0 - print: "**** done thrashosds 3-thrash" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+ rename to qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+ diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml similarity index 90% rename from qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml index e35bfc2208d..1a1d5e683c7 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: jewel + branch: luminous clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml similarity index 92% rename from qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml index 9d6c2e23296..da926680f06 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: jewel + branch: luminous clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml similarity index 97% rename from qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml index 0382520a09e..8833d4d8794 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml @@ -1,6 +1,6 @@ meta: - desc: | - randomized correctness test for rados operations on a replicated pool, + randomized correctness test for rados operations on a replicated pool, using only reads, writes, and deletes split_tasks: sequential: diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/+ b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/5-workload/+ rename to qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+ diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml similarity index 89% rename from qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml index 22a5f5750d3..3a9452ad3b8 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: jewel + branch: luminous clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml new file mode 120000 index 00000000000..52e4a5e6849 --- /dev/null +++ b/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml @@ -0,0 +1 @@ +../../../../releases/mimic.yaml \ No newline at end of file diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+ b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+ rename to qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+ diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rbd-python.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rbd-python.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml similarity index 95% rename from qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml index e41f47ad0db..76e5d6fc231 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml +++ b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml @@ -2,7 +2,7 @@ meta: - desc: | swift api tests for rgw tasks: -- rgw: +- rgw: client.0: - print: "**** done rgw 9-workload" - swift: diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/snaps-many-objects.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/8-workload/snaps-many-objects.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml rename to qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml