From 5673ff2e0032f1b7fabb94b5682fdcc4bb7ef566 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 17 Jan 2020 15:06:54 -0600 Subject: [PATCH 1/2] qa/suites/upgrade/mimix-x-singleton: upgrading to octopus, not n Signed-off-by: Sage Weil --- qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml | 1 - qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml create mode 120000 qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml diff --git a/qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml b/qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml deleted file mode 120000 index 9e99b7d2829..00000000000 --- a/qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/releases/nautilus.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml b/qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml new file mode 120000 index 00000000000..344983858fc --- /dev/null +++ b/qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml @@ -0,0 +1 @@ +.qa/releases/octopus.yaml \ No newline at end of file From 5ef77e116529bea0b29375fb07f34da7cb2a9312 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 17 Jan 2020 17:52:40 -0600 Subject: [PATCH 2/2] qa/releases/octopus: disable autoscale warnings Existing pools might have too many/few PGs and produce a warning that prevents us from getting to HEALTH_OK. Signed-off-by: Sage Weil --- qa/releases/octopus.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/releases/octopus.yaml b/qa/releases/octopus.yaml index a834310f773..935603395ad 100644 --- a/qa/releases/octopus.yaml +++ b/qa/releases/octopus.yaml @@ -3,4 +3,5 @@ tasks: osd.0: - ceph osd require-osd-release octopus - ceph osd set-require-min-compat-client octopus + - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - ceph.healthy: