From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 2 Jun 2023 08:18:24 +0000 (+0200)
Subject: qa/suites/upgrade: enable default RBD image features
X-Git-Tag: v18.2.1~297^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79d0e04bbd19f67a5983321fd3f650f921e19edb;p=ceph.git

qa/suites/upgrade: enable default RBD image features

Until commit 9fe05da41370 ("Revert "test: adjust rbd test case guards
to handle new defaults""), default RBD image features were enabled only
in Python API tests; C/C++ API tests were still exercising format 1
(6-7 years after its deprecation!).

Enable format 2 with default image features universally across upgrade
suites.

Fixes: https://tracker.ceph.com/issues/61505
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 05e24270a2efe85bcdceade87b0e91efcfca3001)
---

diff --git a/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_api.yaml b/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_api.yaml
index 6e67e9cf1697..6a0242b91555 100644
--- a/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_api.yaml
+++ b/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_api.yaml
@@ -9,4 +9,6 @@ workload:
         clients:
           client.0:
               - rbd/test_librbd.sh
+        env:
+          RBD_FEATURES: "61"
     - print: "**** done end test_rbd_api.yaml"
diff --git a/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml b/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml
index 59ed40474388..8d1f0fd0f8bd 100644
--- a/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml
+++ b/qa/suites/upgrade/pacific-x/parallel/workload/test_rbd_python.yaml
@@ -14,5 +14,7 @@ workload:
         clients:
           client.0:
             - rbd/test_librbd_python.sh
+        env:
+          RBD_FEATURES: "61"
     - print: "**** done end test_rbd_python.yaml"
 
diff --git a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml
index 400cc5f7de58..d69c3688755c 100644
--- a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml
+++ b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml
@@ -7,4 +7,6 @@ first-half-tasks:
      clients:
         client.0:
            - rbd/test_librbd.sh
+        env:
+          RBD_FEATURES: "61"
 - print: "**** done rbd/test_librbd.sh 7-workload"
diff --git a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml
index a3f5c9e39c37..ef32e5bbc66b 100644
--- a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml
+++ b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml
@@ -7,4 +7,6 @@ stress-tasks:
      clients:
         client.0:
            - rbd/test_librbd.sh
+        env:
+          RBD_FEATURES: "61"
 - print: "**** done rbd/test_librbd.sh 7-workload"
diff --git a/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_api.yaml b/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_api.yaml
index d8098313598e..c871d4c8cb0f 100644
--- a/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_api.yaml
+++ b/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_api.yaml
@@ -9,4 +9,6 @@ workload:
         clients:
           client.0:
               - rbd/test_librbd.sh
+        env:
+          RBD_FEATURES: "61"
     - print: "**** done end test_rbd_api.yaml"
diff --git a/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_python.yaml b/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_python.yaml
index c30560895481..3ae98ed1ea19 100644
--- a/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_python.yaml
+++ b/qa/suites/upgrade/quincy-x/parallel/workload/test_rbd_python.yaml
@@ -14,5 +14,7 @@ workload:
         clients:
           client.0:
             - rbd/test_librbd_python.sh
+        env:
+          RBD_FEATURES: "61"
     - print: "**** done end test_rbd_python.yaml"
 
diff --git a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml
index 87b89ec197bd..ac773cde9d60 100644
--- a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml
+++ b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml
@@ -7,4 +7,6 @@ first-half-tasks:
      clients:
         client.0:
            - rbd/test_librbd.sh
+        env:
+          RBD_FEATURES: "61"
 - print: "**** done rbd/test_librbd.sh 7-workload"
diff --git a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml
index 1d4714ab4a0c..9892ced39aef 100644
--- a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml
+++ b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml
@@ -7,4 +7,6 @@ stress-tasks:
      clients:
         client.0:
            - rbd/test_librbd.sh
+        env:
+          RBD_FEATURES: "61"
 - print: "**** done rbd/test_librbd.sh 7-workload"