qa/suites/upgrade/jewel-x: remove kraken references

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 3e6f81671dfb4b25a3c91d861b0828640d7e7d9d..2b350635d3ca6f8f86cc0ef8f6ce2dc769d9d8d4 100644 (file)
--- a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -34,9 +34,3 @@ upgrade-sequence:
        daemons: [osd.2, osd.3]
        wait-for-healthy: false
        wait-for-osds-up: true
-   - exec:
-       mon.a:
-         - ceph osd set require_kraken_osds
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 60

diff --git a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index d1d96e0147b3cc3f462ae65ed3232dcc50a55a51..19abc9b628ecd98b85eaca0084eae0460add2c9d 100644 (file)
--- a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -205,9 +205,4 @@ upgrade-sequence_x:
        daemons: [osd.5]
        wait-for-healthy: false
        wait-for-up-osds: true
-   - exec:
-       mon.a:
-         - ceph osd set require_kraken_osds
-   - sleep:
-       duration: 60
    - print: "**** done ceph.restart all -x branch mds/osd/mon"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml
index 7f4b06be2a535480f99e43320ec9f590f4303fe3..92779bc24c6faddeb2df2b844da58f9ce609f019 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml
@@ -3,7 +3,7 @@ meta:
    run basic cls tests for rbd
 stress-tasks:
 - workunit:
-    branch: kraken
+    branch: jewel
     clients:
       client.0:
         - cls/test_cls_rbd.sh

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-import-export.yaml
index b8b6ad3bad33028ce7dc364f88035855ed41b9b6..693154d0c73c6be9457d1a86ac3f57db0f3925b9 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-import-export.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-import-export.yaml
@@ -3,7 +3,7 @@ meta:
    run basic import/export cli tests for rbd
 stress-tasks:
 - workunit:
-    branch: kraken
+    branch: jewel
     clients:
       client.0:
         - rbd/import_export.sh

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml
index a5ae1e53e74f027635132655ca5d151524e75682..64c0e33475b3a8eeaf9d63bfabfabf7d588093b5 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml
@@ -3,7 +3,7 @@ meta:
    librbd C and C++ api tests
 stress-tasks:
 - workunit:
-     branch: kraken
+     branch: jewel
      clients:
         client.0:
            - rbd/test_librbd.sh

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rbd-python.yaml
index 24c2644b9ac8a18c7e60a5b10d453741f58e6704..56ba21d7a180a64f224001d62d60a3f5dc299aee 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rbd-python.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rbd-python.yaml
@@ -3,7 +3,6 @@ meta:
    librbd python api tests
 tasks:
 - workunit:
-    branch: kraken
     clients:
       client.0:
         - rbd/test_librbd_python.sh