From: Patrick Donnelly Date: Tue, 3 Mar 2026 18:01:07 +0000 (-0500) Subject: reef: qa: allow deploying previous releases with reef cephadm X-Git-Tag: v18.2.8~1^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4dccf706f55fa7e49b64e70d396564aa695cca07;p=ceph.git reef: qa: allow deploying previous releases with reef cephadm Signed-off-by: Patrick Donnelly Fixes: https://tracker.ceph.com/issues/75034 --- diff --git a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml index 478f1d1265a..f17bb9b5abd 100644 --- a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml @@ -22,6 +22,7 @@ tasks: - print: "**** done start installing pacific cephadm ..." - cephadm: image: quay.io/ceph/ceph:v16.2.15 + allow_mismatched_release: true conf: osd: #set config option for which cls modules are allowed to be loaded / used diff --git a/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml b/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml index b021e575e44..352141f824d 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml @@ -14,6 +14,7 @@ tasks: - cephadm: image: quay.io/ceph/ceph:v16.2.15 + allow_mismatched_release: true conf: osd: #set config option for which cls modules are allowed to be loaded / used diff --git a/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml b/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml index 9e8be43d05a..f02579aa26a 100644 --- a/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml @@ -8,6 +8,7 @@ tasks: - cephadm: # XXX 17.2.9 has no containers (see ML message) image: quay.io/ceph/ceph:v17.2.8 + allow_mismatched_release: true conf: osd: #set config option for which cls modules are allowed to be loaded / used diff --git a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml index 930d6f8950e..eaa42d70e6f 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml @@ -7,6 +7,7 @@ tasks: - cephadm: # XXX 17.2.9 has no containers (see ML message) image: quay.io/ceph/ceph:v17.2.8 + allow_mismatched_release: true conf: osd: #set config option for which cls modules are allowed to be loaded / used diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 2c25cfd63f1..fb45358ca19 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -621,6 +621,8 @@ def ceph_bootstrap(ctx, config): cmd += ['--skip-monitoring-stack'] if config.get('single_host_defaults'): cmd += ['--single-host-defaults'] + if config.get('allow_mismatched_release'): + cmd += ['--allow-mismatched-release'] if not config.get('avoid_pacific_features', False): cmd += ['--skip-admin-label'] # bootstrap makes the keyring root 0600, so +r it for our purposes