diff options
Diffstat (limited to 'qa')
130 files changed, 364 insertions, 269 deletions
diff --git a/qa/distros/a-supported-distro.yaml b/qa/distros/a-supported-distro.yaml deleted file mode 120000 index 33a40b6e4..000000000 --- a/qa/distros/a-supported-distro.yaml +++ /dev/null @@ -1 +0,0 @@ -all/centos_7.2.yaml
\ No newline at end of file diff --git a/qa/distros/all/centos_7.6.yaml b/qa/distros/all/centos_7.6.yaml index 81014e102..1eddf680c 100644 --- a/qa/distros/all/centos_7.6.yaml +++ b/qa/distros/all/centos_7.6.yaml @@ -2,6 +2,6 @@ os_type: centos os_version: "7.6" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/centos_8.0.yaml b/qa/distros/all/centos_8.0.yaml index 1679bf0d5..787bbfeb0 100644 --- a/qa/distros/all/centos_8.0.yaml +++ b/qa/distros/all/centos_8.0.yaml @@ -2,6 +2,6 @@ os_type: centos os_version: "8.0" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/centos_8.1.yaml b/qa/distros/all/centos_8.1.yaml index f764e5079..986e74abf 100644 --- a/qa/distros/all/centos_8.1.yaml +++ b/qa/distros/all/centos_8.1.yaml @@ -2,6 +2,6 @@ os_type: centos os_version: "8.1" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/centos_8.2.yaml b/qa/distros/all/centos_8.2.yaml index 1ccbd8abd..d9f6178c6 100644 --- a/qa/distros/all/centos_8.2.yaml +++ b/qa/distros/all/centos_8.2.yaml @@ -2,6 +2,6 @@ os_type: centos os_version: "8.2" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/centos_8.3.yaml b/qa/distros/all/centos_8.3.yaml index b9a7c2579..54e1c3b11 100644 --- a/qa/distros/all/centos_8.3.yaml +++ b/qa/distros/all/centos_8.3.yaml @@ -2,6 +2,6 @@ os_type: centos os_version: "8.3" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/centos_8.stream.yaml b/qa/distros/all/centos_8.stream.yaml index 5ae75c6be..f9607d2c6 100644 --- a/qa/distros/all/centos_8.stream.yaml +++ b/qa/distros/all/centos_8.stream.yaml @@ -2,6 +2,6 @@ os_type: centos os_version: "8.stream" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/centos_9.stream.yaml b/qa/distros/all/centos_9.stream.yaml index 52d553bd6..7fe93afcf 100644 --- a/qa/distros/all/centos_9.stream.yaml +++ b/qa/distros/all/centos_9.stream.yaml @@ -1,2 +1,6 @@ os_type: centos os_version: "9.stream" +overrides: + selinux: + allowlist: + - scontext=system_u:system_r:getty_t:s0 diff --git a/qa/distros/all/rhel_7.6.yaml b/qa/distros/all/rhel_7.6.yaml index 37bc0fb4a..5a0753014 100644 --- a/qa/distros/all/rhel_7.6.yaml +++ b/qa/distros/all/rhel_7.6.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "7.6" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/rhel_7.7.yaml b/qa/distros/all/rhel_7.7.yaml index ac44fe18e..654c73177 100644 --- a/qa/distros/all/rhel_7.7.yaml +++ b/qa/distros/all/rhel_7.7.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "7.7" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/rhel_8.0.yaml b/qa/distros/all/rhel_8.0.yaml index da6a33ed0..760573990 100644 --- a/qa/distros/all/rhel_8.0.yaml +++ b/qa/distros/all/rhel_8.0.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "8.0" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/rhel_8.1.yaml b/qa/distros/all/rhel_8.1.yaml index c73893149..4b0439c0f 100644 --- a/qa/distros/all/rhel_8.1.yaml +++ b/qa/distros/all/rhel_8.1.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "8.1" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/rhel_8.3.yaml b/qa/distros/all/rhel_8.3.yaml index 4e44bbff5..48414fe75 100644 --- a/qa/distros/all/rhel_8.3.yaml +++ b/qa/distros/all/rhel_8.3.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "8.3" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/rhel_8.4.yaml b/qa/distros/all/rhel_8.4.yaml index 5a299ffc5..2d4088392 100644 --- a/qa/distros/all/rhel_8.4.yaml +++ b/qa/distros/all/rhel_8.4.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "8.4" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/rhel_8.5.yaml b/qa/distros/all/rhel_8.5.yaml index 3e02bb196..591b22661 100644 --- a/qa/distros/all/rhel_8.5.yaml +++ b/qa/distros/all/rhel_8.5.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "8.5" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/all/rhel_8.6.yaml b/qa/distros/all/rhel_8.6.yaml index 1f9a6b73f..f70647ed8 100644 --- a/qa/distros/all/rhel_8.6.yaml +++ b/qa/distros/all/rhel_8.6.yaml @@ -2,6 +2,6 @@ os_type: rhel os_version: "8.6" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 ktype: distro diff --git a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml index 4a76306f1..3dad3b845 100644 --- a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml +++ b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml @@ -2,7 +2,7 @@ os_type: centos os_version: "8.stream" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 tasks: diff --git a/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml index b06e1c87d..d1d395b93 100644 --- a/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml +++ b/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml @@ -2,7 +2,7 @@ os_type: centos os_version: "8.stream" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 tasks: diff --git a/qa/distros/container-hosts/centos_9.stream.yaml b/qa/distros/container-hosts/centos_9.stream.yaml new file mode 100644 index 000000000..45295bb4a --- /dev/null +++ b/qa/distros/container-hosts/centos_9.stream.yaml @@ -0,0 +1,11 @@ +os_type: centos +os_version: "9.stream" +overrides: + selinux: + whitelist: + - scontext=system_u:system_r:logrotate_t:s0 + +tasks: +- pexec: + all: + - sudo dnf install nvmetcli nvme-cli -y diff --git a/qa/distros/container-hosts/centos_9.stream_runc.yaml b/qa/distros/container-hosts/centos_9.stream_runc.yaml new file mode 100644 index 000000000..ed9cb9cc8 --- /dev/null +++ b/qa/distros/container-hosts/centos_9.stream_runc.yaml @@ -0,0 +1,13 @@ +os_type: centos +os_version: "9.stream" +overrides: + selinux: + whitelist: + - scontext=system_u:system_r:logrotate_t:s0 + +tasks: +- pexec: + all: + - sudo dnf install runc nvmetcli nvme-cli -y + - sudo sed -i 's/^#runtime = "crun"/runtime = "runc"/g' /usr/share/containers/containers.conf + - sudo sed -i 's/runtime = "crun"/#runtime = "crun"/g' /usr/share/containers/containers.conf diff --git a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml deleted file mode 100644 index 361d8546e..000000000 --- a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml +++ /dev/null @@ -1,13 +0,0 @@ -os_type: rhel -os_version: "8.6" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 -tasks: -- pexec: - all: - - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools:3.0 --allowerasing --nobest - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml deleted file mode 100644 index be94ed69e..000000000 --- a/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml +++ /dev/null @@ -1,13 +0,0 @@ -os_type: rhel -os_version: "8.6" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 -tasks: -- pexec: - all: - - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools:rhel8 --allowerasing --nobest - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/container-hosts/ubuntu_22.04.yaml b/qa/distros/container-hosts/ubuntu_22.04.yaml new file mode 120000 index 000000000..0a708b4db --- /dev/null +++ b/qa/distros/container-hosts/ubuntu_22.04.yaml @@ -0,0 +1 @@ +.qa/distros/all/ubuntu_22.04.yaml
\ No newline at end of file diff --git a/qa/distros/crimson-supported-all-distro/centos_8.yaml b/qa/distros/crimson-supported-all-distro/centos_8.yaml deleted file mode 120000 index b7e6c9b4e..000000000 --- a/qa/distros/crimson-supported-all-distro/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/centos_8.yaml
\ No newline at end of file diff --git a/qa/distros/podman/centos_8.stream_container_tools.yaml b/qa/distros/podman/centos_8.stream_container_tools.yaml index 4a76306f1..3dad3b845 100644 --- a/qa/distros/podman/centos_8.stream_container_tools.yaml +++ b/qa/distros/podman/centos_8.stream_container_tools.yaml @@ -2,7 +2,7 @@ os_type: centos os_version: "8.stream" overrides: selinux: - whitelist: + allowlist: - scontext=system_u:system_r:logrotate_t:s0 tasks: diff --git a/qa/distros/podman/centos_9.stream.yaml b/qa/distros/podman/centos_9.stream.yaml new file mode 100644 index 000000000..d3bc430e6 --- /dev/null +++ b/qa/distros/podman/centos_9.stream.yaml @@ -0,0 +1,7 @@ +os_type: centos +os_version: "9.stream" +overrides: + selinux: + whitelist: + - scontext=system_u:system_r:logrotate_t:s0 + diff --git a/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml deleted file mode 100644 index 361d8546e..000000000 --- a/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml +++ /dev/null @@ -1,13 +0,0 @@ -os_type: rhel -os_version: "8.6" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 -tasks: -- pexec: - all: - - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools:3.0 --allowerasing --nobest - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml deleted file mode 100644 index be94ed69e..000000000 --- a/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml +++ /dev/null @@ -1,13 +0,0 @@ -os_type: rhel -os_version: "8.6" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 -tasks: -- pexec: - all: - - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools:rhel8 --allowerasing --nobest - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/single-container-host.yaml b/qa/distros/single-container-host.yaml index f71756d42..08e1be9c2 120000 --- a/qa/distros/single-container-host.yaml +++ b/qa/distros/single-container-host.yaml @@ -1 +1 @@ -container-hosts/centos_8.stream_container_tools_crun.yaml
\ No newline at end of file +container-hosts/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/distros/supported-all-distro/centos_8.yaml b/qa/distros/supported-all-distro/centos_8.yaml deleted file mode 120000 index b7e6c9b4e..000000000 --- a/qa/distros/supported-all-distro/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/centos_8.yaml
\ No newline at end of file diff --git a/qa/distros/supported-all-distro/rhel_8.yaml b/qa/distros/supported-all-distro/rhel_8.yaml deleted file mode 120000 index f803f091e..000000000 --- a/qa/distros/supported-all-distro/rhel_8.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/rhel_8.yaml
\ No newline at end of file diff --git a/qa/distros/supported-container-hosts/centos_9.stream.yaml b/qa/distros/supported-container-hosts/centos_9.stream.yaml new file mode 120000 index 000000000..584cad677 --- /dev/null +++ b/qa/distros/supported-container-hosts/centos_9.stream.yaml @@ -0,0 +1 @@ +../container-hosts/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml b/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml new file mode 120000 index 000000000..81b17ea14 --- /dev/null +++ b/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml @@ -0,0 +1 @@ +../container-hosts/centos_9.stream_runc.yaml
\ No newline at end of file diff --git a/qa/distros/supported-container-hosts/ubuntu_22.04.yaml b/qa/distros/supported-container-hosts/ubuntu_22.04.yaml new file mode 120000 index 000000000..01afa8a63 --- /dev/null +++ b/qa/distros/supported-container-hosts/ubuntu_22.04.yaml @@ -0,0 +1 @@ +../container-hosts/ubuntu_22.04.yaml
\ No newline at end of file diff --git a/qa/distros/supported-random-distro$/centos_8.yaml b/qa/distros/supported-random-distro$/centos_8.yaml deleted file mode 120000 index b7e6c9b4e..000000000 --- a/qa/distros/supported-random-distro$/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/centos_8.yaml
\ No newline at end of file diff --git a/qa/distros/supported-random-distro$/rhel_8.yaml b/qa/distros/supported-random-distro$/rhel_8.yaml deleted file mode 120000 index f803f091e..000000000 --- a/qa/distros/supported-random-distro$/rhel_8.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/rhel_8.yaml
\ No newline at end of file diff --git a/qa/distros/supported/centos_8.stream.yaml b/qa/distros/supported/centos_8.stream.yaml deleted file mode 120000 index e96091bb1..000000000 --- a/qa/distros/supported/centos_8.stream.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/distros/supported/rhel_latest.yaml b/qa/distros/supported/rhel_latest.yaml deleted file mode 120000 index f803f091e..000000000 --- a/qa/distros/supported/rhel_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/rhel_8.yaml
\ No newline at end of file diff --git a/qa/suites/crimson-rados/basic/centos_8.stream.yaml b/qa/suites/crimson-rados/basic/centos_8.stream.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/crimson-rados/basic/centos_8.stream.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/crimson-rados/rbd/centos_8.stream.yaml b/qa/suites/crimson-rados/rbd/centos_8.stream.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/crimson-rados/rbd/centos_8.stream.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash/centos_8.stream.yaml b/qa/suites/crimson-rados/thrash/centos_8.stream.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/crimson-rados/thrash/centos_8.stream.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml new file mode 120000 index 000000000..e787191b5 --- /dev/null +++ b/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml new file mode 120000 index 000000000..dc442c241 --- /dev/null +++ b/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/quincy.yaml index e7774423f..7d3611649 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/quincy.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/octopus latest + install ceph/quincy latest tasks: - install: - branch: octopus + branch: quincy exclude_packages: - librados3 - ceph-mgr-dashboard @@ -13,7 +13,7 @@ tasks: - cephadm - ceph-volume extra_packages: ['librados2'] -- print: "**** done installing octopus" +- print: "**** done installing quincy" - ceph: log-ignorelist: - overall HEALTH_ @@ -35,5 +35,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client octopus + - ceph osd set-require-min-compat-client quincy - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml index 976d6e265..f545d8bfa 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml @@ -1,6 +1,10 @@ tasks: - ceph-fuse: -- print: "**** done octopus client" + client.0: + client_feature_range: "[0-13],[15-21]" + client.1: + client_feature_range: "[0-13],[15-21]" +- print: "**** done client" - workunit: clients: all: diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml index 26c185946..928c40d20 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml @@ -22,7 +22,6 @@ tasks: - install.upgrade: # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons mon.a: - branch: quincy - print: "**** done install.upgrade the host" - ceph.restart: daemons: [mon.*, mgr.*] @@ -42,7 +41,7 @@ tasks: mon.a: - ceph osd dump -f json-pretty - ceph versions - - ceph osd require-osd-release quincy + - ceph osd require-osd-release reef - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - ceph.healthy: - print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/yes.yaml index 138d8f4e2..138d8f4e2 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/yes.yaml diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml new file mode 120000 index 000000000..e787191b5 --- /dev/null +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml new file mode 120000 index 000000000..dc442c241 --- /dev/null +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/quincy.yaml index e7774423f..7d3611649 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/quincy.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/octopus latest + install ceph/quincy latest tasks: - install: - branch: octopus + branch: quincy exclude_packages: - librados3 - ceph-mgr-dashboard @@ -13,7 +13,7 @@ tasks: - cephadm - ceph-volume extra_packages: ['librados2'] -- print: "**** done installing octopus" +- print: "**** done installing quincy" - ceph: log-ignorelist: - overall HEALTH_ @@ -35,5 +35,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client octopus + - ceph osd set-require-min-compat-client quincy - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml index c9b4c046f..3485dd680 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml @@ -3,9 +3,11 @@ overrides: nuke-on-error: false tasks: - ceph-fuse: -- print: "**** done octopus client" -#- workunit: -# clients: -# all: -# - suites/fsstress.sh + client.1: + client_feature_range: "[0-13],[15-21]" +- print: "**** done client" +- workunit: + clients: + all: + - suites/fsstress.sh - print: "**** done fsstress" diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml index e5ea8b19c..c1d65d25c 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml @@ -22,7 +22,6 @@ tasks: - install.upgrade: # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons mon.a: - branch: quincy - print: "**** done install.upgrade the host" - ceph.restart: daemons: [mon.*, mgr.*] @@ -42,7 +41,7 @@ tasks: mon.a: - ceph versions - ceph osd dump -f json-pretty - - ceph osd require-osd-release quincy + - ceph osd require-osd-release reef - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - ceph.healthy: - print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml index 251c349ac..58fdfdbd8 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml @@ -1,7 +1,6 @@ tasks: - install.upgrade: client.0: - branch: quincy - print: "**** done install.upgrade on client.0" - ceph-fuse: client.0: diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml deleted file mode 120000 index 7a86f967f..000000000 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml new file mode 120000 index 000000000..dc442c241 --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml new file mode 120000 index 000000000..e787191b5 --- /dev/null +++ b/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/nofs/centos_8.yaml b/qa/suites/fs/upgrade/nofs/centos_8.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/fs/upgrade/nofs/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml new file mode 120000 index 000000000..dc442c241 --- /dev/null +++ b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml index b74accc69..7d3611649 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml +++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/pacific latest + install ceph/quincy latest tasks: - install: - branch: pacific + branch: quincy exclude_packages: - librados3 - ceph-mgr-dashboard @@ -13,7 +13,7 @@ tasks: - cephadm - ceph-volume extra_packages: ['librados2'] -- print: "**** done installing pacific" +- print: "**** done installing quincy" - ceph: log-ignorelist: - overall HEALTH_ @@ -35,5 +35,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client pacific + - ceph osd set-require-min-compat-client quincy - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml index 858142871..253013000 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml +++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml @@ -38,7 +38,7 @@ tasks: - ceph versions - ceph osd dump -f json-pretty - ceph fs dump - - ceph osd require-osd-release quincy + - ceph osd require-osd-release reef - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - ceph.healthy: - print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml new file mode 120000 index 000000000..e787191b5 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml new file mode 120000 index 000000000..dc442c241 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml deleted file mode 100644 index 02f541eaf..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml +++ /dev/null @@ -1,53 +0,0 @@ -meta: -- desc: | - install ceph/nautilus latest -tasks: -- install: - branch: nautilus - exclude_packages: - - cephadm - - ceph-mgr-cephadm - - ceph-immutable-object-cache - - python3-rados - - python3-rgw - - python3-rbd - - python3-cephfs - - ceph-volume - extra_packages: - - python-rados - - python-rgw - - python-rbd - - python-cephfs - # For kernel_untar_build workunit - extra_system_packages: - - bison - - flex - - elfutils-libelf-devel - - openssl-devel - - NetworkManager - - iproute - - util-linux -- print: "**** done installing nautilus" -- ceph: - log-ignorelist: - - overall HEALTH_ - - \(FS_ - - \(MDS_ - - \(OSD_ - - \(MON_DOWN\) - - \(CACHE_POOL_ - - \(POOL_ - - \(MGR_DOWN\) - - \(PG_ - - \(SMALLER_PGP_NUM\) - - Monitor daemon marked osd - - Behind on trimming - - Manager daemon - conf: - global: - mon warn on pool no app: false - ms bind msgr2: false -- exec: - osd.0: - - ceph osd set-require-min-compat-client nautilus -- print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml index defb03922..356f87787 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/pacific latest + install ceph/quincy latest tasks: - install: - branch: pacific + branch: quincy exclude_packages: - cephadm - ceph-mgr-cephadm @@ -27,7 +27,7 @@ tasks: - NetworkManager - iproute - util-linux -- print: "**** done installing pacific" +- print: "**** done installing quincy" - ceph: log-ignorelist: - overall HEALTH_ @@ -49,5 +49,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client pacific -- print: "**** done ceph" + - ceph osd set-require-min-compat-client quincy +- print: "**** done ceph"
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml index 34c85a00e..bed83610f 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml @@ -9,6 +9,7 @@ tasks: - install.upgrade: client.0: - print: "**** done install.upgrade on client.0" +- ceph.healthy: - ceph-fuse: client.0: -- print: "**** done remount client" +- print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml index ecc705600..ecc705600 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% deleted file mode 100644 index e69de29bb..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% +++ /dev/null diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml deleted file mode 100644 index 2d948af19..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml +++ /dev/null @@ -1,14 +0,0 @@ -teuthology: - postmerge: - - if not is_fuse() then reject() end -tasks: -- ceph-fuse: - client.0: - mounted: false -- print: "**** done unmount client.0" -- install.upgrade: - client.0: -- print: "**** done install.upgrade on client.0" -- ceph-fuse: - client.0: -- print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa new file mode 120000 index 000000000..fea2489fd --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa @@ -0,0 +1 @@ +../.qa
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% index e69de29bb..e69de29bb 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml index 9508cce65..9508cce65 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa new file mode 120000 index 000000000..fea2489fd --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa @@ -0,0 +1 @@ +../.qa
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml index a2f8b3052..a2f8b3052 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml index 9fb8adcea..9fb8adcea 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml index dc777f36d..dc777f36d 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml index f4d0ead4f..f4d0ead4f 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml index 317ebf8c4..317ebf8c4 120000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml diff --git a/qa/suites/fs/workload/0-centos_9.stream.yaml b/qa/suites/fs/workload/0-centos_9.stream.yaml new file mode 120000 index 000000000..dca92ddbf --- /dev/null +++ b/qa/suites/fs/workload/0-centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/fs/workload/0-rhel_8.yaml b/qa/suites/fs/workload/0-rhel_8.yaml deleted file mode 120000 index c9abcd7b8..000000000 --- a/qa/suites/fs/workload/0-rhel_8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml deleted file mode 120000 index 7a86f967f..000000000 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml new file mode 120000 index 000000000..dca92ddbf --- /dev/null +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/no-agent-workunits/0-distro b/qa/suites/orch/cephadm/no-agent-workunits/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/no-agent-workunits/0-distro +++ b/qa/suites/orch/cephadm/no-agent-workunits/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ +++ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/osds/0-distro b/qa/suites/orch/cephadm/osds/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/osds/0-distro +++ b/qa/suites/orch/cephadm/osds/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-roleless/0-distro b/qa/suites/orch/cephadm/smoke-roleless/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/smoke-roleless/0-distro +++ b/qa/suites/orch/cephadm/smoke-roleless/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ b/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ +++ b/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/.qa b/qa/suites/orch/cephadm/smoke-small/0-distro/.qa new file mode 120000 index 000000000..fea2489fd --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-small/0-distro/.qa @@ -0,0 +1 @@ +../.qa
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml deleted file mode 120000 index 83fe02026..000000000 --- a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml +++ /dev/null @@ -1 +0,0 @@ -../.qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml new file mode 120000 index 000000000..5ef2595cf --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml @@ -0,0 +1 @@ +.qa/distros/container-hosts/centos_9.stream_runc.yaml
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/0-distro b/qa/suites/orch/cephadm/smoke/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/smoke/0-distro +++ b/qa/suites/orch/cephadm/smoke/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/0-distro b/qa/suites/orch/cephadm/thrash/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/thrash/0-distro +++ b/qa/suites/orch/cephadm/thrash/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml index bb9a220e6..6272eb0f1 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml @@ -1,13 +1,7 @@ os_type: centos -os_version: "8.stream" +os_version: "9.stream" tasks: -- pexec: - all: - - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup - - sudo dnf -y module reset container-tools - - sudo dnf -y module install container-tools - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf - cephadm: image: quay.io/ceph/ceph:v16.2.0 cephadm_branch: v16.2.0 diff --git a/qa/suites/orch/cephadm/with-work/0-distro b/qa/suites/orch/cephadm/with-work/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/with-work/0-distro +++ b/qa/suites/orch/cephadm/with-work/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro b/qa/suites/orch/cephadm/workunits/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/orch/cephadm/workunits/0-distro +++ b/qa/suites/orch/cephadm/workunits/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml deleted file mode 120000 index 7a86f967f..000000000 --- a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml new file mode 120000 index 000000000..dca92ddbf --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/orch/rook/smoke/0-distro/ubuntu_22.04.yaml b/qa/suites/orch/rook/smoke/0-distro/ubuntu_22.04.yaml new file mode 120000 index 000000000..e4835e4f7 --- /dev/null +++ b/qa/suites/orch/rook/smoke/0-distro/ubuntu_22.04.yaml @@ -0,0 +1 @@ +.qa/distros/container-hosts/ubuntu_22.04.yaml
\ No newline at end of file diff --git a/qa/suites/powercycle/osd/supported-all-distro b/qa/suites/powercycle/osd/supported-all-distro deleted file mode 120000 index ca82dde58..000000000 --- a/qa/suites/powercycle/osd/supported-all-distro +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-all-distro
\ No newline at end of file diff --git a/qa/suites/powercycle/osd/supported-distros b/qa/suites/powercycle/osd/supported-distros new file mode 120000 index 000000000..23d9e9be8 --- /dev/null +++ b/qa/suites/powercycle/osd/supported-distros @@ -0,0 +1 @@ +.qa/distros/supported
\ No newline at end of file diff --git a/qa/suites/rgw/notifications/centos_latest.yaml b/qa/suites/rgw/notifications/centos_latest.yaml new file mode 120000 index 000000000..bd9854e70 --- /dev/null +++ b/qa/suites/rgw/notifications/centos_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_latest.yaml
\ No newline at end of file diff --git a/qa/suites/rgw/notifications/supported-all-distro$/$ b/qa/suites/rgw/notifications/supported-all-distro$/$ deleted file mode 100644 index e69de29bb..000000000 --- a/qa/suites/rgw/notifications/supported-all-distro$/$ +++ /dev/null diff --git a/qa/suites/rgw/notifications/supported-all-distro$/.qa b/qa/suites/rgw/notifications/supported-all-distro$/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/rgw/notifications/supported-all-distro$/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/
\ No newline at end of file diff --git a/qa/suites/rgw/notifications/supported-all-distro$/centos_8.yaml b/qa/suites/rgw/notifications/supported-all-distro$/centos_8.yaml deleted file mode 120000 index c23fd0540..000000000 --- a/qa/suites/rgw/notifications/supported-all-distro$/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -../.qa/distros/supported-all-distro/centos_8.yaml
\ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_8.stream.yaml b/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_8.stream.yaml deleted file mode 120000 index 5dceec7e2..000000000 --- a/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_8.stream.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_8.stream.yaml
\ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml index 29fb99ae2..162964882 120000 --- a/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml +++ b/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml @@ -1 +1 @@ -.qa/distros/supported/ubuntu_20.04.yaml
\ No newline at end of file +.qa/distros/all/ubuntu_20.04.yaml
\ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml index 29fb99ae2..162964882 120000 --- a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml +++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml @@ -1 +1 @@ -.qa/distros/supported/ubuntu_20.04.yaml
\ No newline at end of file +.qa/distros/all/ubuntu_20.04.yaml
\ No newline at end of file diff --git a/qa/suites/teuthology/buildpackages/supported-all-distro b/qa/suites/teuthology/buildpackages/supported-all-distro deleted file mode 120000 index ca82dde58..000000000 --- a/qa/suites/teuthology/buildpackages/supported-all-distro +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-all-distro
\ No newline at end of file diff --git a/qa/suites/teuthology/buildpackages/supported-distros b/qa/suites/teuthology/buildpackages/supported-distros new file mode 120000 index 000000000..23d9e9be8 --- /dev/null +++ b/qa/suites/teuthology/buildpackages/supported-distros @@ -0,0 +1 @@ +.qa/distros/supported
\ No newline at end of file diff --git a/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ b/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ index 4b341719d..661878557 120000 --- a/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ +++ b/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/upgrade/quincy-x/parallel/0-random-distro$ b/qa/suites/upgrade/quincy-x/parallel/0-random-distro$ index 4b341719d..661878557 120000 --- a/qa/suites/upgrade/quincy-x/parallel/0-random-distro$ +++ b/qa/suites/upgrade/quincy-x/parallel/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/upgrade/quincy-x/stress-split/0-distro b/qa/suites/upgrade/quincy-x/stress-split/0-distro index 4b341719d..661878557 120000 --- a/qa/suites/upgrade/quincy-x/stress-split/0-distro +++ b/qa/suites/upgrade/quincy-x/stress-split/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml index 443b89fcf..eee713292 100644 --- a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml +++ b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml @@ -3,7 +3,7 @@ meta: Run ceph on two nodes, using one of them as a client, with a separate client-only node. Use xfs beneath the osds. - install ceph/reef v18.2.1 and the v18.2.x point versions + install ceph/reef v18.2.2 and the subsequent v18.2.x point versions run workload and upgrade-sequence in parallel (every point release should be tested) run workload and upgrade-sequence in parallel @@ -70,32 +70,32 @@ openstack: count: 3 size: 30 # GB tasks: -- print: "**** done reef about to install v18.2.0 " +- print: "**** done reef about to install v18.2.2 " + # See https://tracker.ceph.com/issues/66505. Versions < v18.2.2 contain the crc bug. - install: - tag: v18.2.0 + tag: v18.2.2 # line below can be removed its from jewel test #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librgw2'] -- print: "**** done v18.2.0 install" +- print: "**** done v18.2.2 install" - ceph: fs: xfs add_osds_to_crush: true - print: "**** done ceph xfs" - sequential: - workload -- print: "**** done workload v18.2.0" +- print: "**** done workload v18.2.2" - -####### upgrade to v18.2.1 -- install.upgrade: - #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] - mon.a: - tag: v18.2.1 - mon.b: - tag: v18.2.1 -- parallel: - - workload_reef - - upgrade-sequence_reef -- print: "**** done parallel reef v18.2.1" +# TODO: uncomment when v18.2.3 is available +####### upgrade to v18.2.3 +# - install.upgrade: +# mon.a: +# tag: v18.2.3 +# mon.b: +# tag: v18.2.3 +#- parallel: +# - workload_reef +# - upgrade-sequence_reef +#- print: "**** done parallel reef v18.2.3" #### upgrade to latest reef - install.upgrade: @@ -118,7 +118,7 @@ workload_reef: full_sequential: - workunit: branch: reef - # tag: v18.2.1 + # tag: v18.2.2 clients: client.1: - rados/test.sh diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/.qa b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/.qa new file mode 120000 index 000000000..c4fcc4e00 --- /dev/null +++ b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/.qa @@ -0,0 +1 @@ +../../../../../.qa/
\ No newline at end of file diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_8.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_8.yaml deleted file mode 120000 index bb4a6aaf3..000000000 --- a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../distros/supported-all-distro/centos_8.yaml
\ No newline at end of file diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_9.stream.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_9.stream.yaml new file mode 120000 index 000000000..7a8040fe8 --- /dev/null +++ b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/supported-container-hosts/centos_9.stream.yaml
\ No newline at end of file diff --git a/qa/suites/upgrade/telemetry-upgrade/quincy-x/0-random-distro$ b/qa/suites/upgrade/telemetry-upgrade/quincy-x/0-random-distro$ index 4b341719d..661878557 120000 --- a/qa/suites/upgrade/telemetry-upgrade/quincy-x/0-random-distro$ +++ b/qa/suites/upgrade/telemetry-upgrade/quincy-x/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts
\ No newline at end of file +.qa/distros/supported-container-hosts
\ No newline at end of file diff --git a/qa/tasks/ceph_fuse.py b/qa/tasks/ceph_fuse.py index 70cf9bf83..706bdd977 100644 --- a/qa/tasks/ceph_fuse.py +++ b/qa/tasks/ceph_fuse.py @@ -4,6 +4,7 @@ Ceph FUSE client task import contextlib import logging +import re from teuthology import misc from tasks.cephfs.fuse_mount import FuseMount @@ -86,6 +87,32 @@ def task(ctx, config): client.1: mount_subvol_num: 1 + Example for client mount with custom client feature set + + tasks: + - ceph: + - ceph-fuse: + client.0: + client_feature_range: 21 # everything including CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK + + OR + + tasks: + - ceph: + - ceph-fuse: + client.0: + client_feature_range: "[0-13],[15-21]" # all features except metric_collect (bit 14) + + OR + + tasks: + - ceph: + - ceph-fuse: + client.0: + client_feature_range: "[0-13],16,19,[20-21]" # all features except metric_collect,alternate_name, op_getvxattr, 32bit_retry_fwd + + client_feature_range can have repetitive and overlapping ranges/values - the parsed feature bits would not have duplicates and is sorted. Decreasing ranges are silently ignored. + :param ctx: Context :param config: Configuration """ @@ -161,12 +188,50 @@ def task(ctx, config): for remote in remotes: FuseMount.cleanup_stale_netnses_and_bridge(remote) + def parse_client_feature_range(client_feature_range): + def intify(val): + try: + return int(val) + except ValueError: + log.warn(f'failed to decode feature bit {val}') + raise + feature_bits = [] + pvalue = re.compile(r'(\d+)') + prange = re.compile(r'\[(\d+)\-(\d+)\]') + if (isinstance(client_feature_range, int)): + # everything upto (and including) this feature bit + feature_bits.extend(range(0, client_feature_range+1)) + elif isinstance(client_feature_range, str): + for feat in client_feature_range.split(','): + m = pvalue.match(feat) + if m: + feature_bits.append(intify(m.group(1))) + continue + m = prange.match(feat) + if m: + feature_bits.extend(range(intify(m.group(1)), intify(m.group(2))+1)) + continue + raise ValueError(f'Invalid feature range or value "{feat}"') + else: + raise TypeError("client_feature_range must be of type int or str") + return sorted(set(feature_bits)) + # Mount any clients we have been asked to (default to mount all) log.info('Mounting ceph-fuse clients...') for info in mounted_by_me.values(): config = info["config"] mount_x = info['mount'] - mount_x.mount(mntopts=config.get('mntopts', []), mntargs=config.get('mntargs', [])) + + # apply custom client feature set + client_features = [] + client_feature_range = config.get("client_feature_range", None) + if client_feature_range is not None: + client_features = ",".join(str(i) for i in parse_client_feature_range(client_feature_range)) + mntargs = config.get('mntargs', []) + if client_features: + mntargs.append(f"--client_debug_inject_features={client_features}") + log.debug(f"passing mntargs={mntargs}") + mount_x.mount(mntopts=config.get('mntopts', []), mntargs=mntargs) for info in mounted_by_me.values(): info["mount"].wait_until_mounted() diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index bd92cadaa..f995f7c8b 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -551,30 +551,21 @@ class CephFSMount(object): raise RuntimeError('value of attributes should be either str ' f'or None. {k} - {v}') - def update_attrs(self, client_id=None, client_keyring_path=None, - client_remote=None, hostfs_mntpt=None, cephfs_name=None, - cephfs_mntpt=None): - if not (client_id or client_keyring_path or client_remote or - cephfs_name or cephfs_mntpt or hostfs_mntpt): - return - - self._verify_attrs(client_id=client_id, - client_keyring_path=client_keyring_path, - hostfs_mntpt=hostfs_mntpt, cephfs_name=cephfs_name, - cephfs_mntpt=cephfs_mntpt) - - if client_id: - self.client_id = client_id - if client_keyring_path: - self.client_keyring_path = client_keyring_path - if client_remote: - self.client_remote = client_remote - if hostfs_mntpt: - self.hostfs_mntpt = hostfs_mntpt - if cephfs_name: - self.cephfs_name = cephfs_name - if cephfs_mntpt: - self.cephfs_mntpt = cephfs_mntpt + def update_attrs(self, **kwargs): + verify_keys = [ + 'client_id', + 'client_keyring_path', + 'hostfs_mntpt', + 'cephfs_name', + 'cephfs_mntpt', + ] + + self._verify_attrs(**{key: kwargs[key] for key in verify_keys if key in kwargs}) + + for k in verify_keys: + v = kwargs.get(k) + if v is not None: + setattr(self, k, v) def remount(self, **kwargs): """ @@ -597,7 +588,7 @@ class CephFSMount(object): self.update_attrs(**kwargs) - retval = self.mount(mntopts=mntopts, check_status=check_status) + retval = self.mount(mntopts=mntopts, check_status=check_status, **kwargs) # avoid this scenario (again): mount command might've failed and # check_status might have silenced the exception, yet we attempt to # wait which might lead to an error. diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py index 4f3100bbe..db0e5660a 100644 --- a/qa/tasks/cephfs/test_admin.py +++ b/qa/tasks/cephfs/test_admin.py @@ -1319,6 +1319,92 @@ class TestFsAuthorize(CephFSTestCase): self.captester.conduct_neg_test_for_chown_caps() self.captester.conduct_neg_test_for_truncate_caps() + def test_multifs_rootsquash_nofeature(self): + """ + That having root_squash on one fs doesn't prevent access to others. + """ + + if not isinstance(self.mount_a, FuseMount): + self.skipTest("only FUSE client has CEPHFS_FEATURE_MDS_AUTH_CAPS " + "needed to enforce root_squash MDS caps") + + self.fs1 = self.fs + self.fs2 = self.mds_cluster.newfs('testcephfs2') + + self.mount_a.umount_wait() + + self.run_ceph_cmd(f'auth caps client.{self.mount_a.client_id} ' + f'mon "allow r" ' + f'osd "allow rw tag cephfs data={self.fs1.name}, allow rw tag cephfs data={self.fs2.name}" ' + f'mds "allow rwp fsname={self.fs1.name}, allow rw fsname={self.fs2.name} root_squash"') + + CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK = 21 + # all but CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK + features = ",".join([str(i) for i in range(CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK)]) + mntargs = [f"--client_debug_inject_features={features}"] + + # should succeed + with self.assert_cluster_log("report clients with broken root_squash", present=False): + self.mount_a.remount(mntargs=mntargs, cephfs_name=self.fs1.name) + + def test_rootsquash_nofeature(self): + """ + That having root_squash on an fs without the feature bit raises a HEALTH_ERR warning. + """ + + if not isinstance(self.mount_a, FuseMount): + self.skipTest("only FUSE client has CEPHFS_FEATURE_MDS_AUTH_CAPS " + "needed to enforce root_squash MDS caps") + + self.mount_a.umount_wait() + + FS_AUTH_CAPS = (('/', 'rw', 'root_squash'),) + keyring = self.fs.authorize(self.client_id, FS_AUTH_CAPS) + + CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK = 21 + # all but CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK + features = ",".join([str(i) for i in range(CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK)]) + mntargs = [f"--client_debug_inject_features={features}"] + + # should succeed + with self.assert_cluster_log("with broken root_squash implementation"): + keyring_path = self.mount_a.client_remote.mktemp(data=keyring) + self.mount_a.remount(client_id=self.client_id, client_keyring_path=keyring_path, mntargs=mntargs, cephfs_name=self.fs.name) + self.wait_for_health("MDS_CLIENTS_BROKEN_ROOTSQUASH", 60) + self.assertFalse(self.mount_a.is_blocked()) + + self.mount_a.umount_wait() + self.wait_for_health_clear(60) + + def test_rootsquash_nofeature_evict(self): + """ + That having root_squash on an fs without the feature bit can be evicted. + """ + + if not isinstance(self.mount_a, FuseMount): + self.skipTest("only FUSE client has CEPHFS_FEATURE_MDS_AUTH_CAPS " + "needed to enforce root_squash MDS caps") + + self.mount_a.umount_wait() + + FS_AUTH_CAPS = (('/', 'rw', 'root_squash'),) + keyring = self.fs.authorize(self.client_id, FS_AUTH_CAPS) + + CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK = 21 + # all but CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK + features = ",".join([str(i) for i in range(CEPHFS_FEATURE_MDS_AUTH_CAPS_CHECK)]) + mntargs = [f"--client_debug_inject_features={features}"] + + # should succeed + keyring_path = self.mount_a.client_remote.mktemp(data=keyring) + self.mount_a.remount(client_id=self.client_id, client_keyring_path=keyring_path, mntargs=mntargs, cephfs_name=self.fs.name) + self.wait_for_health("MDS_CLIENTS_BROKEN_ROOTSQUASH", 60) + + self.fs.required_client_features("add", "client_mds_auth_caps") + self.wait_for_health_clear(60) + self.assertTrue(self.mount_a.is_blocked()) + + def test_single_path_rootsquash_issue_56067(self): """ That a FS client using root squash MDS caps allows non-root user to write data diff --git a/qa/tasks/nvme_loop.py b/qa/tasks/nvme_loop.py index c9d8f0dc7..5b29c11f0 100644 --- a/qa/tasks/nvme_loop.py +++ b/qa/tasks/nvme_loop.py @@ -1,5 +1,6 @@ import contextlib import logging +import json from io import StringIO from teuthology import misc as teuthology @@ -66,10 +67,33 @@ def task(ctx, config): with contextutil.safe_while(sleep=1, tries=15) as proceed: while proceed(): - p = remote.run(args=['sudo', 'nvme', 'list'], stdout=StringIO()) + p = remote.run(args=['sudo', 'nvme', 'list', '-o', 'json'], stdout=StringIO()) new_devs = [] - for line in p.stdout.getvalue().splitlines(): - dev, _, vendor = line.split()[0:3] + # `nvme list -o json` will return the following output: + '''{ + "Devices" : [ + { + "DevicePath" : "/dev/nvme0n1", + "Firmware" : "8DV101H0", + "Index" : 0, + "ModelNumber" : "INTEL SSDPEDMD400G4", + "ProductName" : "Unknown Device", + "SerialNumber" : "PHFT620400WB400BGN" + }, + { + "DevicePath" : "/dev/nvme1n1", + "Firmware" : "5.15.0-1", + "Index" : 1, + "ModelNumber" : "Linux", + "ProductName" : "Unknown Device", + "SerialNumber" : "7672ce414766ba44a8e5" + } + ] + }''' + nvme_list = json.loads(p.stdout.getvalue()) + for device in nvme_list['Devices']: + dev = device['DevicePath'] + vendor = device['ModelNumber'] if dev.startswith('/dev/') and vendor == 'Linux': new_devs.append(dev) log.info(f'new_devs {new_devs}') diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py index 6533026b4..3c0f7c3b5 100644 --- a/qa/tasks/qemu.py +++ b/qa/tasks/qemu.py @@ -8,6 +8,8 @@ import os import yaml import time +from packaging.version import Version + from tasks import rbd from tasks.util.workunit import get_refspec_after_overrides from teuthology import contextutil @@ -492,7 +494,10 @@ def run_qemu(ctx, config): ) nfs_service_name = 'nfs' - if remote.os.name in ['rhel', 'centos'] and float(remote.os.version) >= 8: + if ( + remote.os.name in ['rhel', 'centos'] and + Version(remote.os.version.lower().removesuffix(".stream")) >= Version("8") + ): nfs_service_name = 'nfs-server' # make an nfs mount to use for logging and to diff --git a/qa/workunits/cephadm/test_dashboard_e2e.sh b/qa/workunits/cephadm/test_dashboard_e2e.sh index 32e0bcc77..13746ec6d 100755 --- a/qa/workunits/cephadm/test_dashboard_e2e.sh +++ b/qa/workunits/cephadm/test_dashboard_e2e.sh @@ -20,6 +20,9 @@ install_common () { $SUDO apt-get update $SUDO apt-get install nodejs elif grep -q rhel /etc/*-release; then + if grep -q "CentOS Stream 9" /etc/*-release; then + NODEJS_VERSION="18" + fi $SUDO yum module -y enable nodejs:$NODEJS_VERSION $SUDO yum install -y jq npm else diff --git a/qa/workunits/cephadm/test_iscsi_pids_limit.sh b/qa/workunits/cephadm/test_iscsi_pids_limit.sh index bed4cc9e2..40bc60856 100755 --- a/qa/workunits/cephadm/test_iscsi_pids_limit.sh +++ b/qa/workunits/cephadm/test_iscsi_pids_limit.sh @@ -12,7 +12,17 @@ test ${CONT_COUNT} -eq 2 for i in ${ISCSI_CONT_IDS} do - test $(sudo podman exec ${i} cat /sys/fs/cgroup/pids/pids.max) == max + # cgroups v1 and v2 have slightly different file locations for the pids.max + # so check both spots + if [ $(sudo podman exec ${i} cat /sys/fs/cgroup/pids/pids.max) ]; then + pid_limit=$(sudo podman exec ${i} cat /sys/fs/cgroup/pids/pids.max) + elif [ $(sudo podman exec ${i} cat /sys/fs/cgroup/pids.max) ]; then + pid_limit=$(sudo podman exec ${i} cat /sys/fs/cgroup/pids.max) + else + echo "could not find pids.max inside container" + exit 1 + fi + test $pid_limit == max done for i in ${ISCSI_CONT_IDS} diff --git a/qa/workunits/cephadm/test_repos.sh b/qa/workunits/cephadm/test_repos.sh index 221585fd0..5c17e5106 100755 --- a/qa/workunits/cephadm/test_repos.sh +++ b/qa/workunits/cephadm/test_repos.sh @@ -30,7 +30,7 @@ function test_install_uninstall() { sudo zypper -n remove cephadm ) } -sudo $CEPHADM -v add-repo --release octopus +sudo $CEPHADM -v add-repo --release quincy test_install_uninstall sudo $CEPHADM -v rm-repo @@ -38,7 +38,7 @@ sudo $CEPHADM -v add-repo --dev main test_install_uninstall sudo $CEPHADM -v rm-repo -sudo $CEPHADM -v add-repo --release 15.2.7 +sudo $CEPHADM -v add-repo --release 17.2.6 test_install_uninstall sudo $CEPHADM -v rm-repo |