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 --- qa/suites/teuthology/.qa | 1 + qa/suites/teuthology/buildpackages/% | 0 qa/suites/teuthology/buildpackages/.qa | 1 + .../teuthology/buildpackages/supported-all-distro | 1 + qa/suites/teuthology/buildpackages/tasks/.qa | 1 + .../teuthology/buildpackages/tasks/default.yaml | 14 ++++++ qa/suites/teuthology/buildpackages/tasks/tag.yaml | 11 +++++ qa/suites/teuthology/ceph/% | 0 qa/suites/teuthology/ceph/.qa | 1 + qa/suites/teuthology/ceph/clusters/.qa | 1 + qa/suites/teuthology/ceph/clusters/single.yaml | 2 + qa/suites/teuthology/ceph/distros | 1 + qa/suites/teuthology/ceph/tasks/.qa | 1 + qa/suites/teuthology/ceph/tasks/teuthology.yaml | 3 ++ qa/suites/teuthology/integration.yaml | 2 + 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 ++++++++++ qa/suites/teuthology/no-ceph/% | 0 qa/suites/teuthology/no-ceph/.qa | 1 + qa/suites/teuthology/no-ceph/clusters/.qa | 1 + qa/suites/teuthology/no-ceph/clusters/single.yaml | 2 + qa/suites/teuthology/no-ceph/tasks/.qa | 1 + qa/suites/teuthology/no-ceph/tasks/teuthology.yaml | 2 + qa/suites/teuthology/nop/% | 0 qa/suites/teuthology/nop/.qa | 1 + qa/suites/teuthology/nop/all/.qa | 1 + qa/suites/teuthology/nop/all/nop.yaml | 3 ++ qa/suites/teuthology/rgw/% | 0 qa/suites/teuthology/rgw/.qa | 1 + qa/suites/teuthology/rgw/distros | 1 + qa/suites/teuthology/rgw/tasks/.qa | 1 + .../teuthology/rgw/tasks/s3tests-civetweb.yaml | 24 ++++++++++ .../teuthology/rgw/tasks/s3tests-fastcgi.yaml | 24 ++++++++++ qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml | 26 +++++++++++ qa/suites/teuthology/workunits/.qa | 1 + qa/suites/teuthology/workunits/yes.yaml | 8 ++++ 41 files changed, 260 insertions(+) create mode 120000 qa/suites/teuthology/.qa create mode 100644 qa/suites/teuthology/buildpackages/% create mode 120000 qa/suites/teuthology/buildpackages/.qa create mode 120000 qa/suites/teuthology/buildpackages/supported-all-distro create mode 120000 qa/suites/teuthology/buildpackages/tasks/.qa create mode 100644 qa/suites/teuthology/buildpackages/tasks/default.yaml create mode 100644 qa/suites/teuthology/buildpackages/tasks/tag.yaml create mode 100644 qa/suites/teuthology/ceph/% create mode 120000 qa/suites/teuthology/ceph/.qa create mode 120000 qa/suites/teuthology/ceph/clusters/.qa create mode 100644 qa/suites/teuthology/ceph/clusters/single.yaml create mode 120000 qa/suites/teuthology/ceph/distros create mode 120000 qa/suites/teuthology/ceph/tasks/.qa create mode 100644 qa/suites/teuthology/ceph/tasks/teuthology.yaml create mode 100644 qa/suites/teuthology/integration.yaml 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 create mode 100644 qa/suites/teuthology/no-ceph/% create mode 120000 qa/suites/teuthology/no-ceph/.qa create mode 120000 qa/suites/teuthology/no-ceph/clusters/.qa create mode 100644 qa/suites/teuthology/no-ceph/clusters/single.yaml create mode 120000 qa/suites/teuthology/no-ceph/tasks/.qa create mode 100644 qa/suites/teuthology/no-ceph/tasks/teuthology.yaml create mode 100644 qa/suites/teuthology/nop/% create mode 120000 qa/suites/teuthology/nop/.qa create mode 120000 qa/suites/teuthology/nop/all/.qa create mode 100644 qa/suites/teuthology/nop/all/nop.yaml create mode 100644 qa/suites/teuthology/rgw/% create mode 120000 qa/suites/teuthology/rgw/.qa create mode 120000 qa/suites/teuthology/rgw/distros create mode 120000 qa/suites/teuthology/rgw/tasks/.qa create mode 100644 qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml create mode 100644 qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml create mode 100644 qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml create mode 120000 qa/suites/teuthology/workunits/.qa create mode 100644 qa/suites/teuthology/workunits/yes.yaml (limited to 'qa/suites/teuthology') diff --git a/qa/suites/teuthology/.qa b/qa/suites/teuthology/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/buildpackages/% b/qa/suites/teuthology/buildpackages/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/teuthology/buildpackages/.qa b/qa/suites/teuthology/buildpackages/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/buildpackages/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/buildpackages/supported-all-distro b/qa/suites/teuthology/buildpackages/supported-all-distro new file mode 120000 index 000000000..ca82dde58 --- /dev/null +++ b/qa/suites/teuthology/buildpackages/supported-all-distro @@ -0,0 +1 @@ +.qa/distros/supported-all-distro \ No newline at end of file diff --git a/qa/suites/teuthology/buildpackages/tasks/.qa b/qa/suites/teuthology/buildpackages/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/buildpackages/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/buildpackages/tasks/default.yaml b/qa/suites/teuthology/buildpackages/tasks/default.yaml new file mode 100644 index 000000000..cb583c763 --- /dev/null +++ b/qa/suites/teuthology/buildpackages/tasks/default.yaml @@ -0,0 +1,14 @@ +roles: + - [client.0] +tasks: + - install: + tag: v0.94.1 + - exec: + client.0: + - ceph --version | grep 'version 0.94.1' + - install.upgrade: + client.0: + tag: v0.94.3 + - exec: + client.0: + - ceph --version | grep 'version 0.94.3' diff --git a/qa/suites/teuthology/buildpackages/tasks/tag.yaml b/qa/suites/teuthology/buildpackages/tasks/tag.yaml new file mode 100644 index 000000000..2bfb8a995 --- /dev/null +++ b/qa/suites/teuthology/buildpackages/tasks/tag.yaml @@ -0,0 +1,11 @@ +roles: + - [mon.a, mgr.x, client.0] +tasks: + - install: + # tag has precedence over branch and sha1 + tag: v0.94.1 + branch: firefly + sha1: e5b6eea91cc37434f78a987d2dd1d3edd4a23f3f # dumpling + - exec: + client.0: + - ceph --version | grep 'version 0.94.1' diff --git a/qa/suites/teuthology/ceph/% b/qa/suites/teuthology/ceph/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/teuthology/ceph/.qa b/qa/suites/teuthology/ceph/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/ceph/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/ceph/clusters/.qa b/qa/suites/teuthology/ceph/clusters/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/ceph/clusters/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/ceph/clusters/single.yaml b/qa/suites/teuthology/ceph/clusters/single.yaml new file mode 100644 index 000000000..0c6a40d0b --- /dev/null +++ b/qa/suites/teuthology/ceph/clusters/single.yaml @@ -0,0 +1,2 @@ +roles: + - [mon.a, mgr.x, client.0] diff --git a/qa/suites/teuthology/ceph/distros b/qa/suites/teuthology/ceph/distros new file mode 120000 index 000000000..23d9e9be8 --- /dev/null +++ b/qa/suites/teuthology/ceph/distros @@ -0,0 +1 @@ +.qa/distros/supported \ No newline at end of file diff --git a/qa/suites/teuthology/ceph/tasks/.qa b/qa/suites/teuthology/ceph/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/ceph/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/ceph/tasks/teuthology.yaml b/qa/suites/teuthology/ceph/tasks/teuthology.yaml new file mode 100644 index 000000000..00081c8aa --- /dev/null +++ b/qa/suites/teuthology/ceph/tasks/teuthology.yaml @@ -0,0 +1,3 @@ +tasks: + - install: + - tests: diff --git a/qa/suites/teuthology/integration.yaml b/qa/suites/teuthology/integration.yaml new file mode 100644 index 000000000..8a7f1c776 --- /dev/null +++ b/qa/suites/teuthology/integration.yaml @@ -0,0 +1,2 @@ +tasks: +- teuthology_integration: 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] diff --git a/qa/suites/teuthology/no-ceph/% b/qa/suites/teuthology/no-ceph/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/teuthology/no-ceph/.qa b/qa/suites/teuthology/no-ceph/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/no-ceph/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/no-ceph/clusters/.qa b/qa/suites/teuthology/no-ceph/clusters/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/no-ceph/clusters/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/no-ceph/clusters/single.yaml b/qa/suites/teuthology/no-ceph/clusters/single.yaml new file mode 100644 index 000000000..0c6a40d0b --- /dev/null +++ b/qa/suites/teuthology/no-ceph/clusters/single.yaml @@ -0,0 +1,2 @@ +roles: + - [mon.a, mgr.x, client.0] diff --git a/qa/suites/teuthology/no-ceph/tasks/.qa b/qa/suites/teuthology/no-ceph/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/no-ceph/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/no-ceph/tasks/teuthology.yaml b/qa/suites/teuthology/no-ceph/tasks/teuthology.yaml new file mode 100644 index 000000000..1391458b5 --- /dev/null +++ b/qa/suites/teuthology/no-ceph/tasks/teuthology.yaml @@ -0,0 +1,2 @@ +tasks: + - tests: diff --git a/qa/suites/teuthology/nop/% b/qa/suites/teuthology/nop/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/teuthology/nop/.qa b/qa/suites/teuthology/nop/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/nop/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/nop/all/.qa b/qa/suites/teuthology/nop/all/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/nop/all/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/nop/all/nop.yaml b/qa/suites/teuthology/nop/all/nop.yaml new file mode 100644 index 000000000..4a5b227e6 --- /dev/null +++ b/qa/suites/teuthology/nop/all/nop.yaml @@ -0,0 +1,3 @@ +tasks: + - nop: + diff --git a/qa/suites/teuthology/rgw/% b/qa/suites/teuthology/rgw/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/teuthology/rgw/.qa b/qa/suites/teuthology/rgw/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/rgw/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/rgw/distros b/qa/suites/teuthology/rgw/distros new file mode 120000 index 000000000..23d9e9be8 --- /dev/null +++ b/qa/suites/teuthology/rgw/distros @@ -0,0 +1 @@ +.qa/distros/supported \ No newline at end of file diff --git a/qa/suites/teuthology/rgw/tasks/.qa b/qa/suites/teuthology/rgw/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml new file mode 100644 index 000000000..cd3e8cf3d --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml @@ -0,0 +1,24 @@ +# this runs s3tests against rgw, using civetweb +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1] + +tasks: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: ceph-pacific +overrides: + ceph: + fs: xfs + conf: + client: + debug rgw: 20 + rgw lc debug interval: 10 + rgw: + ec-data-pool: false + frontend: civetweb diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml new file mode 100644 index 000000000..e6ba864ca --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml @@ -0,0 +1,24 @@ +# this runs s3tests against rgw, using mod_fastcgi +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1] + +tasks: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: ceph-pacific +overrides: + ceph: + fs: xfs + conf: + client: + debug rgw: 20 + rgw lc debug interval: 10 + rgw: + ec-data-pool: false + frontend: apache diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml new file mode 100644 index 000000000..68a531bb3 --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml @@ -0,0 +1,26 @@ +# this runs s3tests against rgw, using mod_proxy_fcgi +# the choice between uds or tcp with mod_proxy_fcgi depends on the distro +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1] + +tasks: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: ceph-pacific +overrides: + ceph: + fs: xfs + conf: + client: + debug rgw: 20 + rgw lc debug interval: 10 + rgw: + ec-data-pool: false + frontend: apache + use_fcgi: true diff --git a/qa/suites/teuthology/workunits/.qa b/qa/suites/teuthology/workunits/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/workunits/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/workunits/yes.yaml b/qa/suites/teuthology/workunits/yes.yaml new file mode 100644 index 000000000..45098dbb8 --- /dev/null +++ b/qa/suites/teuthology/workunits/yes.yaml @@ -0,0 +1,8 @@ +roles: + - [client.0] +tasks: +- install: +- workunit: + clients: + all: + - true.sh -- cgit v1.2.3