qa/suites/upgrade: use correct branch names

Signed-off-by: Neha Ojha <nojha@redhat.com>

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 0a338854c5532d9925f35e1e4113d7765ee7ada9..8c715e90f055cb96c61b05910deb3dd7b9db51d2 100644 (file)
--- 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 1a1d5e683c7b0c7e8754f1a49199cd88bfac6ddd..c041555403cc615cd4dabedec89e957e025863ec 100644 (file)
--- 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 da926680f064d873924e113f0ed3425032141330..997f452d834b5ede641c6e6ba9d0b8277a1b0ea8 100644 (file)
--- 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 3a9452ad3b825870b5879af7f29a996366adc941..ccfc8385f392df8cf5354f7fba30c6eeca823adf 100644 (file)
--- 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 57610eedf756050d7c90b150a3926222b9f059d3..d208a9d3b9c379b9e3902e94d9d39c06040c4568 100644 (file)
--- 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 f8cc4d8ac32b0144009d6fd87d298e6af47f355b..0a1fa6306c01af046886aeb6ea37d96e0c21ce01 100644 (file)
--- 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 30a677af65cf15bcfaf08adea06ba14d103a2329..703f4f7ccb3407afe7a0661b8789740d022982d0 100644 (file)
--- 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 9079aa33b8978464c35b01cf21af0c242e6ab7c1..c6a4de97ffdd89c739a96f97ad1677ddf1b77037 100644 (file)
--- 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 ca512b452133679b17ad270b49d186ee1d602c9d..f2cf947b3380e365a6e99fdb795bd585eff0bc85 100644 (file)
--- 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