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 6e67e9cf169700702b67ae0257b27f3617e8a0df..6a0242b91555a3d974c94815e59db67a86de1f53 100644 (file)
--- 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 59ed404743882d11a2e2332095499f90be2b8299..8d1f0fd0f8bd726523c3f01fcd3e7b4d5c3d3c28 100644 (file)
--- 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 400cc5f7de58eb7c0f103fef6dc36cd9e027a4e7..d69c3688755c1548d16ee0bf31f52789a5061691 100644 (file)
--- 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 a3f5c9e39c37a078deae65b178411ad4fe3b7c4d..ef32e5bbc66bf70b849a382b6bfc755973e8bccf 100644 (file)
--- 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 d8098313598e18d0f2decf4377bf6d43b90a6ba4..c871d4c8cb0f907d89a037b8e6da5e42d7593c91 100644 (file)
--- 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 c30560895481eca2f2bd8fb55addd5167e2e57ac..3ae98ed1ea197590cdf5739ade3786139701bc38 100644 (file)
--- 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 87b89ec197bd4f055cda18ba9846733acc333bd5..ac773cde9d606b2bc54f4654504a30ab785e103d 100644 (file)
--- 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 1d4714ab4a0c9999550cea861df7f04b005c77d8..9892ced39aef7cb0671afde974aaa2614cb56bed 100644 (file)
--- 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"