From: Adam King Date: Fri, 4 Aug 2023 17:30:55 +0000 (-0400) Subject: qa/cephadm: mgr-nfs-upgrade, match any migration > 2 X-Git-Tag: v19.3.0~248^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F52815%2Fhead;p=ceph.git qa/cephadm: mgr-nfs-upgrade, match any migration > 2 I believe this check was originally added because the 2->3 migration migrated some nfs related bits. Since then we've had to update the migration this checks for every time we bump the max migration. This change is intended to instead just have it check for a miration > 2 so we don't have to keep updating it. Signed-off-by: Adam King --- diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml index 3a9169659090..7559885b9715 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml @@ -7,4 +7,8 @@ tasks: - ceph nfs cluster ls | grep foo - ceph nfs export ls foo --detailed - rados -p .nfs --all ls - - - ceph config get mgr mgr/cephadm/migration_current | grep 6 +- cephadm.shell: + host.a: + - | + set -ex + [[ `ceph config get mgr mgr/cephadm/migration_current` -gt 2 ]]