qa/tests: update upgrade tests from jewel->luminous to jewel->luminous->master

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

diff --git a/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous-master.yaml b/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous-master.yaml
new file mode 100644 (file)
index 0000000..672d021
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous-master.yaml
@@ -0,0 +1,69 @@
+meta:
+- desc: |
+    Setup 4 node ceph cluster using ceph-deploy, use latest
+    stable jewel as initial release, upgrade to stable luminous and
+    also setup mgr nodes along after upgrade, check for cluter to
+    reach healthy state and run kernel tar/untar task. Finally upgrade
+    to master dev branch and wait for healthy state, Run systemd and
+    mixed-load gen task. This test will detect any ceph upgrade issue
+    and systemd issues.
+overrides:
+  ceph-deploy:
+    fs: xfs
+    conf:
+      global:
+        mon pg warn min per osd: 2
+      osd:
+        osd pool default size: 2
+        osd objectstore: filestore
+        osd sloppy crc: true
+      client:
+        rbd default features: 5
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - mgr.x
+- - mon.b
+  - mgr.y
+- - mon.c
+  - osd.3
+  - osd.4
+  - osd.5
+- - osd.6
+  - osd.7
+  - osd.8
+  - client.0
+tasks:
+- ssh-keys:
+- ceph-deploy:
+    branch:
+      stable: jewel
+    skip-mgr: True
+- ceph-deploy.upgrade:
+    branch:
+      stable: luminous
+    setup-mgr-node: True
+    check-for-healthy: True
+    roles:
+      - mon.a
+      - mon.b
+      - mon.c
+- workunit:
+    clients:
+      all:
+        - kernel_untar_build.sh
+- ceph-deploy.upgrade:
+    setup-mgr-node: False
+    check-for-healthy: True
+    roles:
+      - mon.a
+      - mon.b
+      - mon.c
+- systemd:
+- workunit:
+    clients:
+      all:
+      - rados/load-gen-mix.sh

diff --git a/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml b/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml
deleted file mode 100644 (file)
index 09ad644..0000000
--- a/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-meta:
-- desc: |
-    Setup 4 node ceph cluster using ceph-deploy, use latest
-    stable jewel as initial release, upgrade to luminous and
-    also setup mgr nodes along after upgrade, check for
-    cluster to reach healthy state, After upgrade run kernel tar/untar
-    task and systemd task. This test will detect any
-    ceph upgrade issue and systemd issues.
-overrides:
-  ceph-deploy:
-    fs: xfs
-    conf:
-      global:
-        mon pg warn min per osd: 2
-      osd:
-        osd pool default size: 2
-        osd objectstore: filestore
-        osd sloppy crc: true
-      client:
-        rbd default features: 5
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mgr.x
-- - mon.b
-  - mgr.y
-- - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-- - osd.6
-  - osd.7
-  - osd.8
-  - client.0
-tasks:
-- ssh-keys:
-- ceph-deploy:
-    branch:
-      stable: jewel
-    skip-mgr: True
-- ceph-deploy.upgrade:
-    branch:
-      dev: luminous
-    setup-mgr-node: True
-    check-for-healthy: True
-    roles:
-      - mon.a
-      - mon.b
-      - mon.c
-- workunit:
-    clients:
-      all:
-        - kernel_untar_build.sh
-- systemd:
-- workunit:
-    clients:
-      all:
-      - rados/load-gen-mix.sh

diff --git a/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous-master.yaml b/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous-master.yaml
new file mode 100644 (file)
index 0000000..0e0c640
--- /dev/null
+++ b/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous-master.yaml
@@ -0,0 +1,69 @@
+meta:
+- desc: |
+    Setup 4 node ceph cluster using ceph-deploy, use latest
+    stable jewel as initial release, upgrade to stable luminous and
+    also setup mgr nodes along after upgrade, check for cluter to
+    reach healthy state and run kernel tar/untar task. Finally upgrade
+    to current master branch and wait for healthy state, Run systemd and
+    mixed-load gen task. This test will detect any ceph upgrade issue
+    and systemd issues.
+overrides:
+  ceph-deploy:
+    fs: xfs
+    conf:
+      global:
+        mon pg warn min per osd: 2
+      osd:
+        osd pool default size: 2
+        osd objectstore: filestore
+        osd sloppy crc: true
+      client:
+        rbd default features: 5
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - mgr.x
+- - mon.b
+  - mgr.y
+- - mon.c
+  - osd.3
+  - osd.4
+  - osd.5
+- - osd.6
+  - osd.7
+  - osd.8
+  - client.0
+tasks:
+- ssh-keys:
+- ceph-deploy:
+    branch:
+      stable: kraken
+    skip-mgr: True
+- ceph-deploy.upgrade:
+    branch:
+      stable: luminous
+    setup-mgr-node: True
+    check-for-healthy: True
+    roles:
+      - mon.a
+      - mon.b
+      - mon.c
+- workunit:
+    clients:
+      all:
+        - kernel_untar_build.sh
+- ceph-deploy.upgrade:
+    setup-mgr-node: False
+    check-for-healthy: True
+    roles:
+      - mon.a
+      - mon.b
+      - mon.c
+- systemd:
+- workunit:
+    clients:
+      all:
+      - rados/load-gen-mix.sh

diff --git a/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous.yaml b/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous.yaml
deleted file mode 100644 (file)
index 4a55362..0000000
--- a/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-meta:
-- desc: |
-    Setup 4 node ceph cluster using ceph-deploy, use latest
-    stable kraken as initial release, upgrade to luminous and
-    also setup mgr nodes along after upgrade, check for
-    cluster to reach healthy state, After upgrade run kernel tar/untar
-    task and systemd task. This test will detect any
-    ceph upgrade issue and systemd issues.
-overrides:
-  ceph-deploy:
-    fs: xfs
-    conf:
-      global:
-        mon pg warn min per osd: 2
-      osd:
-        osd pool default size: 2
-        osd objectstore: filestore
-        osd sloppy crc: true
-      client:
-        rbd default features: 5
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mgr.x
-- - mon.b
-  - mgr.y
-- - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-- - osd.6
-  - osd.7
-  - osd.8
-  - client.0
-tasks:
-- ssh-keys:
-- ceph-deploy:
-    branch:
-      stable: kraken
-    skip-mgr: True
-- ceph-deploy.upgrade:
-    branch:
-      dev: luminous
-    setup-mgr-node: True
-    check-for-healthy: True
-    roles:
-      - mon.a
-      - mon.b
-      - mon.c
-- workunit:
-    clients:
-      all:
-        - kernel_untar_build.sh
-- systemd:
-- workunit:
-    clients:
-      all:
-      - rados/load-gen-mix.sh