From 5f1702e87cf44efd4c9aafebfe600142a97d273c Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Wed, 24 Apr 2019 13:01:20 -0700 Subject: [PATCH] qa/suites/upgrade: use correct branch names Signed-off-by: Neha Ojha --- qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml | 2 +- qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml | 2 +- .../upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml | 2 +- qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml | 2 +- .../upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml | 2 +- .../upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml | 2 +- .../nautilus-x/stress-split/4-workload/rbd-import-export.yaml | 2 +- .../upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml | 2 +- .../nautilus-x/stress-split/7-final-workload/rbd-python.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml index 0a338854c55..8c715e90f05 100644 --- a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml @@ -17,6 +17,6 @@ tasks: - ceph-mgr-rook - ceph-mgr-ssh extra_packages: ['librados2'] -- print: "**** done install luminous" +- print: "**** done install mimic" - ceph: - print: "**** done ceph" diff --git a/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml index 1a1d5e683c7..c041555403c 100644 --- a/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: luminous + branch: mimic clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml index da926680f06..997f452d834 100644 --- a/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: luminous + branch: mimic clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml b/qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml index 3a9452ad3b8..ccfc8385f39 100644 --- a/qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml @@ -4,7 +4,7 @@ meta: split_tasks: sequential: - workunit: - branch: luminous + branch: mimic clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml index 57610eedf75..d208a9d3b9c 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml @@ -1,6 +1,6 @@ meta: - desc: | - install ceph/luminous latest + install ceph/nautilus latest run workload and upgrade-sequence in parallel upgrade the client node tasks: diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml index f8cc4d8ac32..0a1fa6306c0 100644 --- a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml +++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml @@ -3,7 +3,7 @@ meta: run basic cls tests for rbd stress-tasks: - workunit: - branch: luminous + branch: nautilus clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml index 30a677af65c..703f4f7ccb3 100644 --- a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml +++ b/qa/suites/upgrade/nautilus-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: luminous + branch: nautilus clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml index 9079aa33b89..c6a4de97ffd 100644 --- a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml +++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml @@ -3,7 +3,7 @@ meta: librbd C and C++ api tests stress-tasks: - workunit: - branch: luminous + branch: nautilus clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml index ca512b45213..f2cf947b338 100644 --- a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml +++ b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml @@ -8,7 +8,7 @@ overrides: rbd default clone format: 1 tasks: - workunit: - branch: luminous + branch: nautilus clients: client.0: - rbd/test_librbd_python.sh -- 2.39.5