From aa4c673966d2fc6fddac4f43b05b64591b73c385 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Tue, 26 Jan 2021 14:45:29 -0800 Subject: [PATCH] qa/tests: disable test_rbd_python.disable ref: https://tracker.ceph.com/issues/48759 Signed-off-by: Yuri Weinstein --- .../{test_rbd_python.yaml => test_rbd_python.disable} | 1 + .../3-upgrade-sequence/upgrade-all.yaml | 6 ++++++ .../3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 9 ++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) rename qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/{test_rbd_python.yaml => test_rbd_python.disable} (80%) diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.disable similarity index 80% rename from qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.yaml rename to qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.disable index d03abf5d988..2ab3c18cd23 100644 --- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.yaml +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.disable @@ -1,6 +1,7 @@ meta: - desc: | librbd python api tests +#this test disable ref: https://tracker.ceph.com/issues/48759 workload: full_sequential: - workunit: diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml index 6486efdb86a..b033e23d6de 100644 --- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml @@ -7,6 +7,8 @@ upgrade-sequence: daemons: [mon.a, mon.b, mon.c, mgr.x] mon-health-to-clog: false wait-for-healthy: false + - sleep: + duration: 60 - exec: mon.a: - ceph config set global mon_warn_on_msgr2_not_enabled false @@ -15,9 +17,13 @@ upgrade-sequence: daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7, osd.8, osd.9, osd.10, osd.11] wait-for-healthy: false wait-for-osds-up: true + - sleep: + duration: 60 - ceph.restart: #daemons: [mds.a, rgw.*] this needs to be added when mds is enabled in riles daemons: [rgw.*] wait-for-healthy: false wait-for-osds-up: true + - sleep: + duration: 60 - print: "**** done ceph.restart all" diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index f11ad1284e1..29d2251f98b 100644 --- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -31,9 +31,10 @@ upgrade-sequence: wait-for-healthy: true - sleep: duration: 60 - - ceph.restart: [mds.a] - - sleep: - duration: 60 + #this needs to be added when mds is enabled in riles + #- ceph.restart: [mds.a] + #- sleep: + # duration: 60 - sleep: duration: 60 - ceph.restart: @@ -51,3 +52,5 @@ upgrade-sequence: wait-for-healthy: true - sleep: duration: 60 + - print: "**** done upgrade-mon-osd-mds.yaml" + -- 2.47.3