From 99a554671d0036878460754da1bb67943367cced Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 1 Jul 2024 14:08:44 -0400 Subject: [PATCH] qa/suites/fs: pull compiled cephadm for squid branch in mds_upgrade_sequence The approach to pull from github stopped working after quincy. We need to use this new compiled_cephadm_branch option to pull the binary for reef or squid unless the cephadm we want is the one from the actual build we're testing (so basically just pre-upgrade in upgrade tests) Fixes: https://tracker.ceph.com/issues/66786 Signed-off-by: Adam King --- .../fs/upgrade/mds_upgrade_sequence/tasks/0-from/squid.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/squid.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/squid.yaml index fd8e5c9221e..4a5f54dc8c3 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/squid.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/squid.yaml @@ -11,8 +11,7 @@ tasks: - cephadm: image: quay.ceph.io/ceph-ci/ceph:squid roleless: true - cephadm_branch: squid - cephadm_git_url: https://github.com/ceph/ceph + compiled_cephadm_branch: squid conf: osd: #set config option for which cls modules are allowed to be loaded / used -- 2.39.5