From bdd8ffddec219414977240c5692a87a820df6ab6 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 6 Apr 2016 19:01:33 -0700 Subject: [PATCH] suites: add multi-cluster tests to the teuthology suite Signed-off-by: Josh Durgin --- suites/teuthology/multi-cluster/% | 0 suites/teuthology/multi-cluster/all/ceph.yaml | 22 +++++++++ .../multi-cluster/all/thrashosds.yaml | 20 ++++++++ .../teuthology/multi-cluster/all/upgrade.yaml | 48 +++++++++++++++++++ .../multi-cluster/all/workunit.yaml | 21 ++++++++ 5 files changed, 111 insertions(+) create mode 100644 suites/teuthology/multi-cluster/% create mode 100644 suites/teuthology/multi-cluster/all/ceph.yaml create mode 100644 suites/teuthology/multi-cluster/all/thrashosds.yaml create mode 100644 suites/teuthology/multi-cluster/all/upgrade.yaml create mode 100644 suites/teuthology/multi-cluster/all/workunit.yaml diff --git a/suites/teuthology/multi-cluster/% b/suites/teuthology/multi-cluster/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/teuthology/multi-cluster/all/ceph.yaml b/suites/teuthology/multi-cluster/all/ceph.yaml new file mode 100644 index 0000000000000..3fa90b4633edf --- /dev/null +++ b/suites/teuthology/multi-cluster/all/ceph.yaml @@ -0,0 +1,22 @@ +roles: +- - ceph.mon.a + - ceph.mon.b + - backup.osd.0 + - backup.osd.1 + - backup.osd.2 + - backup.client.0 +- - backup.mon.a + - ceph.osd.0 + - ceph.osd.1 + - ceph.osd.2 + - ceph.client.0 + - client.1 + - osd.3 +tasks: +- install: +- ceph: + cluster: backup +- ceph: +- workunit: + clients: + all: [true.sh] diff --git a/suites/teuthology/multi-cluster/all/thrashosds.yaml b/suites/teuthology/multi-cluster/all/thrashosds.yaml new file mode 100644 index 0000000000000..c25a2141c190b --- /dev/null +++ b/suites/teuthology/multi-cluster/all/thrashosds.yaml @@ -0,0 +1,20 @@ +roles: +- - backup.mon.a + - backup.mon.b + - 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/suites/teuthology/multi-cluster/all/upgrade.yaml b/suites/teuthology/multi-cluster/all/upgrade.yaml new file mode 100644 index 0000000000000..944184db00474 --- /dev/null +++ b/suites/teuthology/multi-cluster/all/upgrade.yaml @@ -0,0 +1,48 @@ +overrides: + ceph: + log-whitelist: + - failed to encode map + conf: + mon: + mon warn on legacy crush tunables: false +roles: +- - ceph.mon.a + - ceph.mon.b + - backup.osd.0 + - backup.osd.1 + - backup.osd.2 + - backup.client.0 +- - backup.mon.a + - 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: + all: [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/suites/teuthology/multi-cluster/all/workunit.yaml b/suites/teuthology/multi-cluster/all/workunit.yaml new file mode 100644 index 0000000000000..4c32d9af6a044 --- /dev/null +++ b/suites/teuthology/multi-cluster/all/workunit.yaml @@ -0,0 +1,21 @@ +roles: +- - backup.mon.a + - osd.0 + - osd.1 + - osd.2 + - client.0 + - backup.client.0 +- - mon.a + - 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] -- 2.39.5