From 67ff2de694ac1adbbf2a6e98cb1f3c6bdde08810 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Sun, 10 Sep 2017 15:45:52 -0700 Subject: [PATCH] qa/tests: update upgrade tests from jewel->luminous to jewel->luminous->master Signed-off-by: Vasu Kulkarni --- ...minous.yaml => jewel-luminous-master.yaml} | 20 +++++++++++++------ ...inous.yaml => kraken-luminous-master.yaml} | 20 +++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) rename qa/suites/upgrade/jewel-x/ceph-deploy/{jewel-luminous.yaml => jewel-luminous-master.yaml} (62%) rename qa/suites/upgrade/kraken-x/ceph-deploy/{kraken-luminous.yaml => kraken-luminous-master.yaml} (62%) diff --git a/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml b/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous-master.yaml similarity index 62% rename from qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml rename to qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous-master.yaml index 09ad644b6c905..672d021a3422a 100644 --- a/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml +++ b/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous-master.yaml @@ -1,11 +1,12 @@ 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. + 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 @@ -43,7 +44,7 @@ tasks: skip-mgr: True - ceph-deploy.upgrade: branch: - dev: luminous + stable: luminous setup-mgr-node: True check-for-healthy: True roles: @@ -54,6 +55,13 @@ tasks: 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: diff --git a/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous.yaml b/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous-master.yaml similarity index 62% rename from qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous.yaml rename to qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous-master.yaml index 4a55362751a62..0e0c640e73fca 100644 --- a/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous.yaml +++ b/qa/suites/upgrade/kraken-x/ceph-deploy/kraken-luminous-master.yaml @@ -1,11 +1,12 @@ 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. + 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 @@ -43,7 +44,7 @@ tasks: skip-mgr: True - ceph-deploy.upgrade: branch: - dev: luminous + stable: luminous setup-mgr-node: True check-for-healthy: True roles: @@ -54,6 +55,13 @@ tasks: 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: -- 2.39.5