From 6e998b2f8ca80a84166b8378250d388f395eb3db Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 10 Feb 2017 15:08:54 -0500 Subject: [PATCH] qa/rados/upgrade/jewel-x-singleton: run luminous.yaml at the end renumber too Signed-off-by: Sage Weil --- qa/releases/luminous.yaml | 9 +++++++++ .../jewel-x-singleton/{7-workload => 4-workload}/+ | 0 .../{5-workload => 4-workload}/rbd-cls.yaml | 0 .../{5-workload => 4-workload}/rbd-import-export.yaml | 0 .../{5-workload => 4-workload}/readwrite.yaml | 0 .../{5-workload => 4-workload}/snaps-few-objects.yaml | 0 .../{7-workload => 5-workload}/radosbench.yaml | 0 .../{7-workload => 5-workload}/rbd_api.yaml | 0 .../{8-finish-upgrade.yaml => 6-finish-upgrade.yaml} | 2 ++ .../rados/upgrade/jewel-x-singleton/7-luminous.yaml | 1 + .../jewel-x-singleton/{9-workload => 8-workload}/+ | 0 .../{9-workload => 8-workload}/rbd-python.yaml | 0 .../{9-workload => 8-workload}/rgw-swift.yaml | 0 .../{9-workload => 8-workload}/snaps-many-objects.yaml | 0 14 files changed, 12 insertions(+) create mode 100644 qa/releases/luminous.yaml rename qa/suites/rados/upgrade/jewel-x-singleton/{7-workload => 4-workload}/+ (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{5-workload => 4-workload}/rbd-cls.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{5-workload => 4-workload}/rbd-import-export.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{5-workload => 4-workload}/readwrite.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{5-workload => 4-workload}/snaps-few-objects.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{7-workload => 5-workload}/radosbench.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{7-workload => 5-workload}/rbd_api.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{8-finish-upgrade.yaml => 6-finish-upgrade.yaml} (77%) create mode 120000 qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml rename qa/suites/rados/upgrade/jewel-x-singleton/{9-workload => 8-workload}/+ (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{9-workload => 8-workload}/rbd-python.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{9-workload => 8-workload}/rgw-swift.yaml (100%) rename qa/suites/rados/upgrade/jewel-x-singleton/{9-workload => 8-workload}/snaps-many-objects.yaml (100%) diff --git a/qa/releases/luminous.yaml b/qa/releases/luminous.yaml new file mode 100644 index 00000000000..d6012ffcac1 --- /dev/null +++ b/qa/releases/luminous.yaml @@ -0,0 +1,9 @@ +tasks: +- exec: + osd.0: + - ceph osd set require_luminous_osds +overrides: + ceph: + conf: + mon: + mon warn on osd down out interval zero: false \ No newline at end of file diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/7-workload/+ rename to qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+ diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml similarity index 77% rename from qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml index 7f1632751e8..b48d2a0e3ce 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml @@ -7,3 +7,5 @@ tasks: osd.3: - ceph.restart: daemons: [osd.3, osd.4, osd.5] + wait-for-up: true + wait-for-healthy: false diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml new file mode 120000 index 00000000000..5283ac73e1b --- /dev/null +++ b/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml @@ -0,0 +1 @@ +../../../../releases/luminous.yaml \ No newline at end of file diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+ similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/9-workload/+ rename to qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+ diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml similarity index 100% rename from qa/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml rename to qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml