From: Sage Weil <sage@redhat.com>
Date: Sun, 5 Mar 2017 19:14:40 +0000 (-0500)
Subject: qa/suites/upgrade/jewel-x: remove kraken references
X-Git-Tag: v12.0.1~147^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=468285b65d6bef2d86c80ebdfecf0920294ca5cd;p=ceph.git

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 3e6f81671dfb4..2b350635d3ca6 100644
--- 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 d1d96e0147b3c..19abc9b628ecd 100644
--- 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 7f4b06be2a535..92779bc24c6fa 100644
--- 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 b8b6ad3bad330..693154d0c73c6 100644
--- 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 a5ae1e53e74f0..64c0e33475b3a 100644
--- 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 24c2644b9ac8a..56ba21d7a180a 100644
--- 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