qa/standalone/mon/misc: update for umbrella

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index d0be9964ba2a536570826998bbe8b81c971e630b..38236edaecf9762d526fedcb7257fe8804fee7ab 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -78,8 +78,8 @@ Mon
 
 - [ ] src/tools/monmaptool.cc: bump min_mon_release to X for created (new) clusters
 - [ ] src/test/cli/monmaptool/8.t: update output for monmaptool to X
-- [ ] qa/standalone/mon/misc adjust `TEST_mon_features` (add X cases and adjust `--mon-debug-no-require-X`)
-- [ ] qa/standalone/mon/misc bump up `jqfilter='.monmap.features.persistent | length == N'` to `N+1`
+- [x] qa/standalone/mon/misc adjust `TEST_mon_features` (add X cases and adjust `--mon-debug-no-require-X`)
+- [x] qa/standalone/mon/misc bump up `jqfilter='.monmap.features.persistent | length == N'` to `N+1`
 - [ ] mon/MgrMonitor.cc adjust `always_on_modules`
 - [ ] common/options/global.yaml.in define `mon_debug_no_require_X`
 - [ ] common/options/global.yaml.in remove `mon_debug_no_require_X-2`

diff --git a/qa/standalone/mon/misc.sh b/qa/standalone/mon/misc.sh
index d4f81d91d2f7d0ca37bbaeb001d0181b1d847835..f136db0eb78b3c1479a78f5cf30e5ad4287c8c8e 100755 (executable)
--- a/qa/standalone/mon/misc.sh
+++ b/qa/standalone/mon/misc.sh
@@ -171,7 +171,7 @@ function TEST_mon_features() {
     CEPH_ARGS="--fsid=$fsid --auth-supported=none "
     CEPH_ARGS+="--mon-host=$MONA,$MONB,$MONC "
     CEPH_ARGS+="--mon-debug-no-initial-persistent-features "
-    CEPH_ARGS+="--mon-debug-no-require-tentacle"
+    CEPH_ARGS+="--mon-debug-no-require-umbrella"
 
     run_mon $dir a --public-addr $MONA || return 1
     run_mon $dir b --public-addr $MONB || return 1
@@ -204,6 +204,8 @@ function TEST_mon_features() {
     jq_success "$jqinput" "$jqfilter" "squid" || return 1
     jqfilter='.features.quorum_mon[]|select(. == "tentacle")'
     jq_success "$jqinput" "$jqfilter" "tentacle" || return 1
+    jqfilter='.features.quorum_mon[]|select(. == "umbrella")'
+    jq_success "$jqinput" "$jqfilter" "umbrella" || return 1
 
     # monmap must have no persistent features set, because we
     # don't currently have a quorum made out of all the monitors
@@ -239,6 +241,8 @@ function TEST_mon_features() {
     jq_success "$jqinput" "$jqfilter" "squid" || return 1
     jqfilter='.all.supported[] | select(. == "tentacle")'
     jq_success "$jqinput" "$jqfilter" "tentacle" || return 1
+    jqfilter='.all.supported[] | select(. == "umbrella")'
+    jq_success "$jqinput" "$jqfilter" "umbrella" || return 1
 
     # start third monitor
     run_mon $dir c --public-addr $MONC || return 1
@@ -282,6 +286,8 @@ function TEST_mon_features() {
     jqfilter='.monmap.features.persistent[]|select(. == "tentacle")'
     jq_success "$jqinput" "$jqfilter" "tentacle" || return 1
     jq_success "$jqinput" "$jqfilter" "nvmeof_beacon_diff" || return 1
+    jqfilter='.monmap.features.persistent[]|select(. == "umbrella")'
+    jq_success "$jqinput" "$jqfilter" "tentacle" || return 1
     jqfilter='.monmap.features.persistent | length == 13'
     jq_success "$jqinput" "$jqfilter" || return 1