From: Sridhar Seshasayee Date: Thu, 13 Jan 2022 13:27:09 +0000 (+0530) Subject: qa/suites/upgrade: Fix/Modify upgrade tests to work with 'pacific' release. X-Git-Tag: v16.2.8~215^2~6 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a9182c4fd854749415e14d7ffa0c40916fbdfeeb;p=ceph.git qa/suites/upgrade: Fix/Modify upgrade tests to work with 'pacific' release. This commit is not a cherry-pick and fixes the following issues unique to the pacific release: 1. Fixes the nautilus-x and octopus-x upgrade tests to work with the pacific release by updating the post upgrade step to set the 'require-osd-release' flag to 'pacific'. This is done by using '.qa/releases/pacific.yaml' for all the tests. 2. Fixed an issue in 'upgrade-mon-osd-mds.yaml' under both the nautilus-x/parallel, octopus-x/parallel-no-cephadm tests. The 'wait-for-healthy' check should not be performed after all the osds are upgraded since the 'require-osd-release' warning comes into effect. This check is delayed until after the 'require-osd-release' flag is set to 'pacific'. Signed-off-by: Sridhar Seshasayee --- diff --git a/qa/suites/upgrade/nautilus-x-singleton/7-octopus.yaml b/qa/suites/upgrade/nautilus-x-singleton/7-octopus.yaml deleted file mode 120000 index 0d329c1dd2c26..0000000000000 --- a/qa/suites/upgrade/nautilus-x-singleton/7-octopus.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../releases/octopus.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/7-pacific.yaml b/qa/suites/upgrade/nautilus-x-singleton/7-pacific.yaml new file mode 120000 index 0000000000000..1467fc88ecd2b --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/7-pacific.yaml @@ -0,0 +1 @@ +.qa/releases/pacific.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-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 index f11ad1284e18d..3c45d765865b1 100644 --- a/qa/suites/upgrade/nautilus-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 @@ -43,11 +43,13 @@ upgrade-sequence: duration: 60 - ceph.restart: daemons: [osd.8, osd.9, osd.10, osd.11] - wait-for-healthy: true + wait-for-healthy: false + wait-for-osds-up: true - sleep: duration: 60 - ceph.restart: daemons: [rgw.*] - wait-for-healthy: true + wait-for-healthy: false + wait-for-osds-up: true - sleep: duration: 60 diff --git a/qa/suites/upgrade/nautilus-x/parallel/4-octopus.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-octopus.yaml deleted file mode 120000 index 344983858fc5e..0000000000000 --- a/qa/suites/upgrade/nautilus-x/parallel/4-octopus.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/releases/octopus.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x/parallel/4-pacific.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-pacific.yaml new file mode 120000 index 0000000000000..1467fc88ecd2b --- /dev/null +++ b/qa/suites/upgrade/nautilus-x/parallel/4-pacific.yaml @@ -0,0 +1 @@ +.qa/releases/pacific.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-octopus.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-octopus.yaml deleted file mode 120000 index 344983858fc5e..0000000000000 --- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-octopus.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/releases/octopus.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-pacific.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-pacific.yaml new file mode 120000 index 0000000000000..1467fc88ecd2b --- /dev/null +++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-pacific.yaml @@ -0,0 +1 @@ +.qa/releases/pacific.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x/stress-split/6-octopus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-octopus.yaml deleted file mode 120000 index 344983858fc5e..0000000000000 --- a/qa/suites/upgrade/nautilus-x/stress-split/6-octopus.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/releases/octopus.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x/stress-split/6-pacific.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-pacific.yaml new file mode 120000 index 0000000000000..1467fc88ecd2b --- /dev/null +++ b/qa/suites/upgrade/nautilus-x/stress-split/6-pacific.yaml @@ -0,0 +1 @@ +.qa/releases/pacific.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index 29d2251f98b5e..9f1d20822c5e0 100644 --- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -44,12 +44,14 @@ upgrade-sequence: duration: 60 - ceph.restart: daemons: [osd.8, osd.9, osd.10, osd.11] - wait-for-healthy: true + wait-for-healthy: false + wait-for-osds-up: true - sleep: duration: 60 - ceph.restart: daemons: [rgw.*] - wait-for-healthy: true + wait-for-healthy: false + wait-for-osds-up: true - sleep: duration: 60 - print: "**** done upgrade-mon-osd-mds.yaml"