From 19fcec84d8d7d21e796c7624e521b60d28ee21ed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 20:45:59 +0200 Subject: Adding upstream version 16.2.11+ds. Signed-off-by: Daniel Baumann --- .../parallel-no-cephadm/3-upgrade-sequence/.qa | 1 + .../3-upgrade-sequence/upgrade-all.yaml | 29 +++++++++++ .../3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 58 ++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 120000 qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/.qa create mode 100644 qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml create mode 100644 qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml (limited to 'qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence') diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/.qa b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml new file mode 100644 index 000000000..b033e23d6 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml @@ -0,0 +1,29 @@ +meta: +- desc: | + upgrade the ceph cluster +upgrade-sequence: + sequential: + - ceph.restart: + daemons: [mon.a, mon.b, mon.c, mgr.x] + mon-health-to-clog: false + wait-for-healthy: false + - sleep: + duration: 60 + - exec: + mon.a: + - ceph config set global mon_warn_on_msgr2_not_enabled false + - ceph.healthy: + - ceph.restart: + daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7, osd.8, osd.9, osd.10, osd.11] + wait-for-healthy: false + wait-for-osds-up: true + - sleep: + duration: 60 + - ceph.restart: + #daemons: [mds.a, rgw.*] this needs to be added when mds is enabled in riles + daemons: [rgw.*] + wait-for-healthy: false + wait-for-osds-up: true + - sleep: + duration: 60 + - print: "**** done ceph.restart all" 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 new file mode 100644 index 000000000..9f1d20822 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -0,0 +1,58 @@ +meta: +- desc: | + upgrade the ceph cluster, + upgrate in two steps + step one ordering: mon.a, osd.0, osd.1, mds.a + step two ordering: mon.b, mon.c, osd.2, osd.3 + step three ordering: client.1 + ceph expected to be healthy state after each step +upgrade-sequence: + sequential: + - ceph.restart: + daemons: [mgr.x, mon.a] + wait-for-healthy: true + - sleep: + duration: 60 + - ceph.restart: + daemons: [mon.b] + wait-for-healthy: true + mon-health-to-clog: false + - sleep: + duration: 60 + - ceph.restart: + daemons: [mon.c] + wait-for-healthy: false + mon-health-to-clog: false + - ceph.healthy: + - sleep: + duration: 60 + - ceph.restart: + daemons: [osd.0, osd.1, osd.2, osd.3] + wait-for-healthy: true + - sleep: + duration: 60 + #this needs to be added when mds is enabled in riles + #- ceph.restart: [mds.a] + #- sleep: + # duration: 60 + - sleep: + duration: 60 + - ceph.restart: + daemons: [osd.4, osd.5, osd.6, osd.7] + wait-for-healthy: true + - sleep: + duration: 60 + - ceph.restart: + daemons: [osd.8, osd.9, osd.10, osd.11] + wait-for-healthy: false + wait-for-osds-up: true + - sleep: + duration: 60 + - ceph.restart: + daemons: [rgw.*] + wait-for-healthy: false + wait-for-osds-up: true + - sleep: + duration: 60 + - print: "**** done upgrade-mon-osd-mds.yaml" + -- cgit v1.2.3