From a372b4eca1f25647541943918ae737f20783db11 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Mon, 3 Jul 2017 14:18:14 -0700 Subject: [PATCH] Fixed upgrade sequence to 10.2.0 -> 10.2.7 -> latest -x (10.2.8) Signed-off-by: Yuri Weinstein --- .../point-to-point-upgrade.yaml | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) 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 affdabd08d8e5..09dd6389c2a28 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 @@ -5,9 +5,9 @@ meta: Use xfs beneath the osds. install ceph/jewel v10.2.0 point version run workload and upgrade-sequence in parallel - install ceph/jewel latest version + install ceph/jewel v10.0.7 version run workload and upgrade-sequence in parallel - install ceph/-x version (jewel) + install ceph/-x latest version (jewel) run workload and upgrade-sequence in parallel overrides: ceph: @@ -53,10 +53,12 @@ tasks: - print: "**** done workload v10.2.0" - install.upgrade: mon.a: - branch: jewel + # this has to change to v10.2.8 for the next point release + tag: v10.2.7 exclude_packages: ['ceph-mgr'] mon.b: - branch: jewel + # this has to change to v10.2.8 for the next point release + tag: v10.2.7 exclude_packages: ['ceph-mgr'] # Note that client.a IS NOT upgraded at this point #client.1: @@ -64,12 +66,13 @@ tasks: - parallel: - workload_jewel - upgrade-sequence_jewel -- print: "**** done parallel jewel branch" +- print: "**** done parallel jewel v10.2.0 + v10.2.7 branch" - install.upgrade: client.1: - branch: jewel + # this has to change to v10.2.8 for the next point release + tag: v10.2.7 exclude_packages: ['ceph-mgr'] -- print: "**** done branch: jewel install.upgrade on client.1" +- print: "**** done branch: jewel v10.2.7 install.upgrade on client.1" - install.upgrade: mon.a: mon.b: @@ -145,6 +148,15 @@ upgrade-sequence_jewel: - sleep: duration: 60 - ceph.restart: [mon.c] + - sleep: + duration: 60 + - ceph.restart: + daemons: [mon.c] + wait-for-healthy: false + wait-for-up-osds: true + - exec: + mon.a: + - ceph osd set require_jewel_osds - sleep: duration: 60 - print: "**** done ceph.restart all jewel branch mds/osd/mon" @@ -202,13 +214,7 @@ upgrade-sequence_x: - ceph.restart: [osd.4] - sleep: duration: 30 - - ceph.restart: - daemons: [osd.5] - wait-for-healthy: false - wait-for-up-osds: true - - exec: - mon.a: - - ceph osd set require_jewel_osds + - ceph.restart: [osd.5] - sleep: - duration: 60 + duration: 30 - print: "**** done ceph.restart all -x branch mds/osd/mon" -- 2.39.5