From: Matan Breizman <mbreizma@redhat.com>
Date: Tue, 10 Jun 2025 07:30:31 +0000 (+0300)
Subject: qa/suties/crimson-rados: Don't override flavor
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=57c05e93594a390d43a13be358b106a5cf6fe5ac;p=ceph.git

qa/suties/crimson-rados: Don't override flavor

flavor crimson is deprecated, let the flavor to be set when passing --flavor/-f when
scheduling jobs instead.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 20c4f4f5e5d4946a1c725a13db0221f900d47b4c)
---

diff --git a/qa/config/crimson_qa_overrides.yaml b/qa/config/crimson_qa_overrides.yaml
index bb1ed58880253..864ac273ee105 100644
--- a/qa/config/crimson_qa_overrides.yaml
+++ b/qa/config/crimson_qa_overrides.yaml
@@ -12,7 +12,6 @@ overrides:
         debug ms: 20
         seastore cache lru size: 64M
         seastore max concurrent transactions: 8
-    flavor: crimson
   workunit:
     env:
       CRIMSON_COMPAT: '1'
diff --git a/qa/suites/crimson-rados-experimental/thrash/deploy/ceph.yaml b/qa/suites/crimson-rados-experimental/thrash/deploy/ceph.yaml
index ecad09cfe3ad6..67393c5640feb 100644
--- a/qa/suites/crimson-rados-experimental/thrash/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados-experimental/thrash/deploy/ceph.yaml
@@ -1,11 +1,6 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
 tasks:
 - install:
 - ceph:
     conf:
       osd:
         debug monc: 20
-    flavor: crimson
diff --git a/qa/suites/crimson-rados/basic/deploy/ceph.yaml b/qa/suites/crimson-rados/basic/deploy/ceph.yaml
index c22f08eecf8de..1af2f4b1bd2ac 100644
--- a/qa/suites/crimson-rados/basic/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados/basic/deploy/ceph.yaml
@@ -1,7 +1,3 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
 tasks:
 - install:
 - ceph:
@@ -15,4 +11,3 @@ tasks:
         mon osdmap full prune min: 15
         mon osdmap full prune interval: 2
         mon osdmap full prune txsize: 2
-    flavor: crimson
diff --git a/qa/suites/crimson-rados/perf/deploy/ceph.yaml b/qa/suites/crimson-rados/perf/deploy/ceph.yaml
index 50d170f502272..1169a920ead69 100644
--- a/qa/suites/crimson-rados/perf/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados/perf/deploy/ceph.yaml
@@ -1,7 +1,3 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
 tasks:
 - install:
 - ceph:
@@ -9,5 +5,4 @@ tasks:
     conf:
       osd:
         debug monc: 20
-    flavor: crimson
 - ssh_keys:
diff --git a/qa/suites/crimson-rados/rbd/deploy/ceph.yaml b/qa/suites/crimson-rados/rbd/deploy/ceph.yaml
index c22f08eecf8de..1af2f4b1bd2ac 100644
--- a/qa/suites/crimson-rados/rbd/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados/rbd/deploy/ceph.yaml
@@ -1,7 +1,3 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
 tasks:
 - install:
 - ceph:
@@ -15,4 +11,3 @@ tasks:
         mon osdmap full prune min: 15
         mon osdmap full prune interval: 2
         mon osdmap full prune txsize: 2
-    flavor: crimson
diff --git a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
index 56e4b7d657b87..43e03908292ed 100644
--- a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
@@ -11,8 +11,6 @@ openstack:
       count: 3
       size: 10 # GB
 tasks:
-- install:
-    flavor: crimson
 - ceph:
     pre-mgr-commands:
       - sudo ceph config set mgr mgr_pool false --force
diff --git a/qa/suites/crimson-rados/thrash/deploy/ceph.yaml b/qa/suites/crimson-rados/thrash/deploy/ceph.yaml
index ecad09cfe3ad6..67393c5640feb 100644
--- a/qa/suites/crimson-rados/thrash/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados/thrash/deploy/ceph.yaml
@@ -1,11 +1,6 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
 tasks:
 - install:
 - ceph:
     conf:
       osd:
         debug monc: 20
-    flavor: crimson
diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/deploy/ceph.yaml b/qa/suites/crimson-rados/thrash_seastore_radosbench/deploy/ceph.yaml
index ecad09cfe3ad6..67393c5640feb 100644
--- a/qa/suites/crimson-rados/thrash_seastore_radosbench/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados/thrash_seastore_radosbench/deploy/ceph.yaml
@@ -1,11 +1,6 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
 tasks:
 - install:
 - ceph:
     conf:
       osd:
         debug monc: 20
-    flavor: crimson
diff --git a/qa/suites/crimson-rados/thrash_simple/deploy/ceph.yaml b/qa/suites/crimson-rados/thrash_simple/deploy/ceph.yaml
index ecad09cfe3ad6..67393c5640feb 100644
--- a/qa/suites/crimson-rados/thrash_simple/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados/thrash_simple/deploy/ceph.yaml
@@ -1,11 +1,6 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
 tasks:
 - install:
 - ceph:
     conf:
       osd:
         debug monc: 20
-    flavor: crimson