From c79fa6d780580f99b62117e54326a4ef4b7adfef Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 22 Dec 2020 19:25:48 -0500 Subject: [PATCH] qa/tasks/cephadm: include first mgr host when applying mgrs This prevents the first mgr from being shut down due to lack of appropriate placements. Signed-off-by: Josh Durgin Signed-off-by: Yuri Weinstein --- qa/crontab/teuthology-cronjobs | 2 ++ .../octopus-x/{fixed-2.yaml => 0-start.yaml} | 2 -- .../octopus-x/{1-start.yaml => 1-tasks.yaml} | 2 -- .../upgrade/octopus-x/3-start-upgrade.yaml | 9 ------- qa/suites/upgrade/octopus-x/4-wait.yaml | 11 --------- .../upgrade/octopus-x/upgrade-sequence.yaml | 15 ++++++++++++ .../octopus-x/workload/test_rbd_api.yaml | 24 +++++++++---------- qa/tasks/cephadm.py | 4 ++-- 8 files changed, 31 insertions(+), 38 deletions(-) rename qa/suites/upgrade/octopus-x/{fixed-2.yaml => 0-start.yaml} (83%) rename qa/suites/upgrade/octopus-x/{1-start.yaml => 1-tasks.yaml} (91%) delete mode 100644 qa/suites/upgrade/octopus-x/3-start-upgrade.yaml delete mode 100644 qa/suites/upgrade/octopus-x/4-wait.yaml create mode 100644 qa/suites/upgrade/octopus-x/upgrade-sequence.yaml diff --git a/qa/crontab/teuthology-cronjobs b/qa/crontab/teuthology-cronjobs index 59b2a153f6f..36406cdda06 100644 --- a/qa/crontab/teuthology-cronjobs +++ b/qa/crontab/teuthology-cronjobs @@ -186,3 +186,5 @@ CEPH_QA_EMAIL="ceph-qa@ceph.io" 20 01 * * 3,4 CEPH_BRANCH=master; MACHINE_NAME=smithi; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade-clients/client-upgrade-octopus-pacific -k distro -e $CEPH_QA_EMAIL --suite-branch octopus +22 14 * * 3,4 CEPH_BRANCH=master; MACHINE_NAME=smithi; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -k distro -n 7 -m $MACHINE_NAME -s upgrade/octopus-x -e $CEPH_QA_EMAIL -p 70 --force-priority + diff --git a/qa/suites/upgrade/octopus-x/fixed-2.yaml b/qa/suites/upgrade/octopus-x/0-start.yaml similarity index 83% rename from qa/suites/upgrade/octopus-x/fixed-2.yaml rename to qa/suites/upgrade/octopus-x/0-start.yaml index 5ad2eb38fd1..387053022ae 100644 --- a/qa/suites/upgrade/octopus-x/fixed-2.yaml +++ b/qa/suites/upgrade/octopus-x/0-start.yaml @@ -7,12 +7,10 @@ roles: - osd.2 - osd.3 - client.0 -# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start - node-exporter.a - alertmanager.a - - mon.b - mgr.x - - mgr.z - osd.4 - osd.5 - osd.6 diff --git a/qa/suites/upgrade/octopus-x/1-start.yaml b/qa/suites/upgrade/octopus-x/1-tasks.yaml similarity index 91% rename from qa/suites/upgrade/octopus-x/1-start.yaml rename to qa/suites/upgrade/octopus-x/1-tasks.yaml index 5e71207316d..c6b7b0894e8 100644 --- a/qa/suites/upgrade/octopus-x/1-start.yaml +++ b/qa/suites/upgrade/octopus-x/1-tasks.yaml @@ -4,8 +4,6 @@ tasks: - print: "**** done install task..." - print: "**** done start installing octopus cephadm ..." - cephadm: - #image: docker.io/ceph/ceph:v15.2.0 - #cephadm_branch: v15.2.0 image: docker.io/ceph/daemon-base:latest-octopus cephadm_branch: octopus conf: diff --git a/qa/suites/upgrade/octopus-x/3-start-upgrade.yaml b/qa/suites/upgrade/octopus-x/3-start-upgrade.yaml deleted file mode 100644 index d0b2532e938..00000000000 --- a/qa/suites/upgrade/octopus-x/3-start-upgrade.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# renamed tasks: to upgrade-sequence: -upgrade-sequence: - sequential: - - print: "**** done start upgrade" - - cephadm.shell: - env: [sha1] - mon.a: - - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 - - print: "**** done end upgrade" diff --git a/qa/suites/upgrade/octopus-x/4-wait.yaml b/qa/suites/upgrade/octopus-x/4-wait.yaml deleted file mode 100644 index 8e03083cd1c..00000000000 --- a/qa/suites/upgrade/octopus-x/4-wait.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- print: "**** done start wait..." -- cephadm.shell: - env: [sha1] - mon.a: - - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done - - ceph orch ps - - ceph versions - - ceph versions | jq -e '.overall | length == 1' - - ceph versions | jq -e '.overall | keys' | grep $sha1 -- print: "**** done end wait..." diff --git a/qa/suites/upgrade/octopus-x/upgrade-sequence.yaml b/qa/suites/upgrade/octopus-x/upgrade-sequence.yaml new file mode 100644 index 00000000000..cb8cba7079b --- /dev/null +++ b/qa/suites/upgrade/octopus-x/upgrade-sequence.yaml @@ -0,0 +1,15 @@ +# renamed tasks: to upgrade-sequence: +upgrade-sequence: + sequential: + - print: "**** done start upgrade, wait" + - cephadm.shell: + env: [sha1] + mon.a: + - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 + - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done + - ceph orch ps + - ceph versions + - ceph versions | jq -e '.overall | length == 1' + - ceph versions | jq -e '.overall | keys' | grep $sha1 + - print: "**** done end upgrade, wait..." + diff --git a/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml b/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml index d7d8e345170..13646f0855e 100644 --- a/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml +++ b/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml @@ -1,12 +1,12 @@ -#meta: -#- desc: | -# librbd C and C++ api tests -#workload: -# full_sequential: -# - print: "**** done start rbd/test_librbd.sh" -# - workunit: -# branch: octopus -# clients: -# client.0: -# - rbd/test_librbd.sh -# - print: "**** done end rbd/test_librbd.sh" +meta: +- desc: | + librbd C and C++ api tests +workload: + full_sequential: + - print: "**** done start rbd/test_librbd.sh" + - workunit: + branch: octopus + clients: + client.0: + - rbd/test_librbd.sh + - print: "**** done end rbd/test_librbd.sh" diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 027b8dc7b3b..e44a39af4b7 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -540,10 +540,10 @@ def ceph_mgrs(ctx, config): for mgr in [r for r in roles if teuthology.is_type('mgr', cluster_name)(r)]: c_, _, id_ = teuthology.split_role(mgr) - if c_ == cluster_name and id_ == ctx.ceph[cluster_name].first_mgr: - continue log.info('Adding %s on %s' % (mgr, remote.shortname)) nodes.append(remote.shortname + '=' + id_) + if c_ == cluster_name and id_ == ctx.ceph[cluster_name].first_mgr: + continue daemons[mgr] = (remote, id_) if nodes: _shell(ctx, cluster_name, remote, [ -- 2.39.5