From e6918187568dbd01842d8d1d2c808ce16a894239 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 13:54:28 +0200 Subject: Adding upstream version 18.2.2. Signed-off-by: Daniel Baumann --- qa/suites/teuthology/multi-cluster/% | 0 qa/suites/teuthology/multi-cluster/.qa | 1 + qa/suites/teuthology/multi-cluster/all/.qa | 1 + qa/suites/teuthology/multi-cluster/all/ceph.yaml | 25 +++++++++++ .../teuthology/multi-cluster/all/thrashosds.yaml | 21 +++++++++ .../teuthology/multi-cluster/all/upgrade.yaml | 51 ++++++++++++++++++++++ .../teuthology/multi-cluster/all/workunit.yaml | 23 ++++++++++ 7 files changed, 122 insertions(+) create mode 100644 qa/suites/teuthology/multi-cluster/% create mode 120000 qa/suites/teuthology/multi-cluster/.qa create mode 120000 qa/suites/teuthology/multi-cluster/all/.qa create mode 100644 qa/suites/teuthology/multi-cluster/all/ceph.yaml create mode 100644 qa/suites/teuthology/multi-cluster/all/thrashosds.yaml create mode 100644 qa/suites/teuthology/multi-cluster/all/upgrade.yaml create mode 100644 qa/suites/teuthology/multi-cluster/all/workunit.yaml (limited to 'qa/suites/teuthology/multi-cluster') diff --git a/qa/suites/teuthology/multi-cluster/% b/qa/suites/teuthology/multi-cluster/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/teuthology/multi-cluster/.qa b/qa/suites/teuthology/multi-cluster/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/multi-cluster/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/multi-cluster/all/.qa b/qa/suites/teuthology/multi-cluster/all/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/multi-cluster/all/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/multi-cluster/all/ceph.yaml b/qa/suites/teuthology/multi-cluster/all/ceph.yaml new file mode 100644 index 000000000..4659ef3d1 --- /dev/null +++ b/qa/suites/teuthology/multi-cluster/all/ceph.yaml @@ -0,0 +1,25 @@ +roles: +- - ceph.mon.a + - ceph.mon.b + - ceph.mgr.x + - backup.osd.0 + - backup.osd.1 + - backup.osd.2 + - backup.client.0 +- - backup.mon.a + - backup.mgr.x + - ceph.osd.0 + - ceph.osd.1 + - ceph.osd.2 + - ceph.client.0 + - client.1 + - osd.3 +tasks: +- install: +- ceph: + cluster: backup +- ceph: +- workunit: + clients: + ceph.client.0: [true.sh] + backup.client.0: [true.sh] diff --git a/qa/suites/teuthology/multi-cluster/all/thrashosds.yaml b/qa/suites/teuthology/multi-cluster/all/thrashosds.yaml new file mode 100644 index 000000000..52002f57f --- /dev/null +++ b/qa/suites/teuthology/multi-cluster/all/thrashosds.yaml @@ -0,0 +1,21 @@ +roles: +- - backup.mon.a + - backup.mon.b + - backup.mgr.x + - backup.osd.0 + - backup.osd.1 + - backup.osd.2 +- - backup.mon.c + - backup.osd.3 + - backup.osd.4 + - backup.osd.5 + - backup.client.0 +tasks: +- install: +- ceph: + cluster: backup +- thrashosds: + cluster: backup +- workunit: + clients: + all: [true.sh] diff --git a/qa/suites/teuthology/multi-cluster/all/upgrade.yaml b/qa/suites/teuthology/multi-cluster/all/upgrade.yaml new file mode 100644 index 000000000..0973fc390 --- /dev/null +++ b/qa/suites/teuthology/multi-cluster/all/upgrade.yaml @@ -0,0 +1,51 @@ +overrides: + ceph: + log-ignorelist: + - failed to encode map + conf: + mon: + mon warn on legacy crush tunables: false +roles: +- - ceph.mon.a + - ceph.mon.b + - ceph.mgr.x + - backup.osd.0 + - backup.osd.1 + - backup.osd.2 + - backup.client.0 +- - backup.mon.a + - backup.mgr.x + - ceph.osd.0 + - ceph.osd.1 + - ceph.osd.2 + - ceph.client.0 + - client.1 + - osd.3 +tasks: +- install: + branch: infernalis +- ceph: + cluster: backup +- ceph: +- workunit: + clients: + backup.client.0: [true.sh] + ceph.client.0: [true.sh] +- install.upgrade: + ceph.mon.a: + branch: jewel + backup.mon.a: + branch: jewel +- ceph.restart: [ceph.mon.a, ceph.mon.b, ceph.osd.0, ceph.osd.1, ceph.osd.2, osd.3] +- exec: + ceph.client.0: + - ceph --version | grep -F 'version 10.' + client.1: + - ceph --cluster backup --version | grep -F 'version 10.' + backup.client.0: + # cli upgraded + - ceph --cluster backup --id 0 --version | grep -F 'version 10.' + - ceph --version | grep -F 'version 10.' + # backup cluster mon not upgraded + - ceph --cluster backup --id 0 tell mon.a version | grep -F 'version 9.2.' + - ceph tell mon.a version | grep -F 'version 10.' diff --git a/qa/suites/teuthology/multi-cluster/all/workunit.yaml b/qa/suites/teuthology/multi-cluster/all/workunit.yaml new file mode 100644 index 000000000..b1288e38e --- /dev/null +++ b/qa/suites/teuthology/multi-cluster/all/workunit.yaml @@ -0,0 +1,23 @@ +roles: +- - backup.mon.a + - backup.mgr.x + - osd.0 + - osd.1 + - osd.2 + - client.0 + - backup.client.0 +- - mon.a + - mgr.x + - backup.osd.0 + - backup.osd.1 + - backup.osd.2 + - client.1 + - backup.client.1 +tasks: +- install: +- workunit: + clients: + all: [true.sh] +- workunit: + clients: + backup.client.1: [true.sh] -- cgit v1.2.3