From: Sage Weil Date: Tue, 31 Mar 2020 12:57:29 +0000 (-0500) Subject: qa/workunits/cephtool/test.sh: fix require-osd-release test X-Git-Tag: wip-pdonnell-testing-20200918.022351~1561^2~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6833f89990f06bb45c547c1ae50f5205b879abc5;p=ceph-ci.git qa/workunits/cephtool/test.sh: fix require-osd-release test Signed-off-by: Sage Weil --- diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index df66f4708c1..db5ea28a5a4 100644 --- a/doc/dev/release-checklists.rst +++ b/doc/dev/release-checklists.rst @@ -68,6 +68,7 @@ Mon - [x] mon/OSDMonitor.cc `create_initial`: adjust new `require_osd_release`, and add associated `mon_debug_no_require_X` - [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] qa/workunits/cephtool/test.sh: adjust `require-osd-release` test Code cleanup diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 16d8fa551e4..79533aff13d 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1479,8 +1479,9 @@ function test_mon_osd() expect_false ceph osd set $f expect_false ceph osd unset $f done - ceph osd require-osd-release octopus + ceph osd require-osd-release pacific # can't lower + expect_false ceph osd require-osd-release octopus expect_false ceph osd require-osd-release nautilus expect_false ceph osd require-osd-release mimic expect_false ceph osd require-osd-release luminous