From 978b3494c32485b4bf15d1964c8a37de4f530ca3 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 16 Sep 2022 10:32:58 -0400 Subject: [PATCH] qa: turn fail_fs off in case default changes Signed-off-by: Patrick Donnelly --- .../mds_upgrade_sequence/tasks/4-config-upgrade/+ | 0 .../tasks/4-config-upgrade/fail_fs.yaml | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/+ diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/+ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml index 9b21958bebc..fbde19a221e 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml @@ -1,9 +1,15 @@ teuthology: premerge: | - if not yaml.teuthology.variables.fail_fs then reject() end + local set = yaml.teuthology.variables.fail_fs + local cmd = "ceph config set mgr mgr/orchestrator/fail_fs "..tostring(set) + local cmds = yaml_fragment['upgrade-tasks'].sequential[0]['cephadm.shell']['host.a'] + if set then + py_attrgetter(cmds).append "ceph config set mgr mgr/orchestrator/fail_fs true" + else + py_attrgetter(cmds).append "ceph config set mgr mgr/orchestrator/fail_fs false || true" + end upgrade-tasks: sequential: - cephadm.shell: env: [sha1] - host.a: - - ceph config set mgr mgr/orchestrator/fail_fs true \ No newline at end of file + host.a: []