From: Alex Ainscow Date: Fri, 10 Jan 2025 15:59:33 +0000 (-0500) Subject: qa/workunits/cephtool/test: update to umbrella X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fde867de6f74c23573c54c28f0318ed77f468fb4;p=ceph.git qa/workunits/cephtool/test: update to umbrella Signed-off-by: Alex Ainscow --- diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index 0e2725717a97..d2e96353a13d 100644 --- a/doc/dev/release-checklists.rst +++ b/doc/dev/release-checklists.rst @@ -87,7 +87,7 @@ Mon - [x] mon/OSDMonitor.cc `preprocess_boot`: adjust "disallow boot of " condition to disallow X if `require_osd_release` < X-2. - [x] mon/OSDMonitor.cc: adjust "osd require-osd-release" to (1) allow setting X, and (2) check that all mons *and* OSDs have X - [x] mon/MonCommands.h: adjust "osd require-osd-release" allows options to include X -- [ ] qa/workunits/cephtool/test.sh: adjust `require-osd-release` test +- [x] qa/workunits/cephtool/test.sh: adjust `require-osd-release` test OSDMap ------ diff --git a/qa/releases/umbrella.yaml b/qa/releases/umbrella.yaml new file mode 100644 index 000000000000..87147825350a --- /dev/null +++ b/qa/releases/umbrella.yaml @@ -0,0 +1,6 @@ +tasks: +- exec: + osd.0: + - ceph osd require-osd-release umbrella + - ceph osd set-require-min-compat-client umbrella +- ceph.healthy: diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 57ec1fa0a09c..2a4fa3ff0385 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1589,10 +1589,10 @@ function test_mon_osd() expect_false ceph osd set $f expect_false ceph osd unset $f done - ceph osd require-osd-release tentacle + ceph osd require-osd-release umbrella # can't lower + expect_false ceph osd require-osd-release tentacle expect_false ceph osd require-osd-release squid - expect_false ceph osd require-osd-release reef # these are no-ops but should succeed. ceph osd set noup