From 468285b65d6bef2d86c80ebdfecf0920294ca5cd Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 5 Mar 2017 14:14:40 -0500 Subject: [PATCH] qa/suites/upgrade/jewel-x: remove kraken references Signed-off-by: Sage Weil --- .../parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 6 ------ .../jewel-x/point-to-point-x/point-to-point-upgrade.yaml | 5 ----- .../upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml | 2 +- .../jewel-x/stress-split/4-workload/rbd-import-export.yaml | 2 +- .../upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml | 2 +- .../jewel-x/stress-split/7-final-workload/rbd-python.yaml | 1 - 6 files changed, 3 insertions(+), 15 deletions(-) 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 3e6f81671df..2b350635d3c 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 d1d96e0147b..19abc9b628e 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 7f4b06be2a5..92779bc24c6 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 b8b6ad3bad3..693154d0c73 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 a5ae1e53e74..64c0e33475b 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 24c2644b9ac..56ba21d7a18 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 -- 2.39.5