reef: qa: allow deploying previous releases with reef cephadm

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
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 478f1d1265ac97122621fd2e63a073789c1d5edb..f17bb9b5abd5d4e921c6a80192b0851ea5bfb9ec 100644 (file)
--- 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 b021e575e4468087700f21031d6331f079783ed2..352141f824db663e9bd1cd057521740eb3328142 100644 (file)
--- 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 9e8be43d05afb2979e49c42ba1557f90f84643a3..f02579aa26ae7b28652f828548cd4bbcb0fce842 100644 (file)
--- 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 930d6f8950e15b10e037b81e74f85576f55f8ddc..eaa42d70e6fe3714ae0661861f7b8289afcf0a88 100644 (file)
--- 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 2c25cfd63f1de03c8a304afcb044f5f5a28b4ef7..fb45358ca194c857b1c3b7d922d704cd435dc47a 100644 (file)
--- 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