From b54cb863efd0e5f706842d87be3af030f3eb76eb Mon Sep 17 00:00:00 2001 From: dparmar18 Date: Fri, 26 Aug 2022 21:10:37 +0530 Subject: [PATCH] qa: mds upgrade suite as per merge-hook scripts Signed-off-by: Dhairya Parmar --- .../mds_upgrade_sequence/fail_fs/no.yaml | 3 ++ .../mds_upgrade_sequence/fail_fs/yes.yaml | 3 ++ .../tasks/0-from/pacific.yaml | 2 +- .../tasks/0-from/v16.2.4.yaml | 4 +++ .../tasks/3-upgrade-mgr-staggered.yaml | 18 ++++++++++ .../tasks/3-upgrade-with-workload.yaml | 33 ------------------- .../tasks/4-config-upgrade/fail_fs.yaml | 9 +++++ .../tasks/5-upgrade-with-workload.yaml | 33 +++++++++++++++++++ .../tasks/{4-verify.yaml => 6-verify.yaml} | 0 9 files changed, 71 insertions(+), 34 deletions(-) create mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/no.yaml create mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/yes.yaml create mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-mgr-staggered.yaml delete mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml create mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml create mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml rename qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/{4-verify.yaml => 6-verify.yaml} (100%) diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/no.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/no.yaml new file mode 100644 index 00000000000..868415bcb58 --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/no.yaml @@ -0,0 +1,3 @@ +teuthology: + variables: + fail_fs: false diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/yes.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/yes.yaml new file mode 100644 index 00000000000..411ff3814cc --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/yes.yaml @@ -0,0 +1,3 @@ +teuthology: + variables: + fail_fs: true diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml index 67c27ba6bac..6432d708055 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml @@ -9,7 +9,7 @@ tasks: - ceph-volume - print: "**** done install task..." - cephadm: - image: quay.io/ceph/daemon-base:latest-pacific + image: quay.ceph.io/ceph-ci/ceph:pacific roleless: true cephadm_branch: pacific cephadm_git_url: https://github.com/ceph/ceph diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml index c732d692ac1..36bfb1b91be 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml @@ -1,3 +1,7 @@ +teuthology: + postmerge: + - if yaml.teuthology.variables.fail_fs then reject() end + meta: - desc: | setup ceph/pacific v16.2.4 diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-mgr-staggered.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-mgr-staggered.yaml new file mode 100644 index 00000000000..fac9e29dbab --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-mgr-staggered.yaml @@ -0,0 +1,18 @@ +teuthology: + premerge: | + if not yaml.teuthology.variables.fail_fs then reject() end +upgrade-tasks: + sequential: + - cephadm.shell: + env: [sha1] + host.a: + - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force + - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force + - ceph config set global log_to_journald false --force + - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --daemon-types mgr + - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph orch upgrade status ; sleep 30 ; done + - ceph versions | jq -e '.mgr | length == 1' + - ceph versions | jq -e '.mgr | keys' | grep $sha1 + - ceph versions | jq -e '.overall | length == 2' + - ceph orch upgrade check quay.ceph.io/ceph-ci/ceph:$sha1 | jq -e '.up_to_date | length == 2' + - ceph orch ps diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml deleted file mode 100644 index 457b7e3c7ff..00000000000 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml +++ /dev/null @@ -1,33 +0,0 @@ -tasks: -- parallel: - - upgrade-tasks - - workload-tasks - -upgrade-tasks: - sequential: - - cephadm.shell: - env: [sha1] - host.a: - - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force - - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force - - ceph config set global log_to_journald false --force - - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 - - cephadm.shell: - env: [sha1] - host.a: - - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph fs dump; ceph orch upgrade status ; sleep 30 ; done - - ceph orch ps - - ceph versions - - echo "wait for servicemap items w/ changing names to refresh" - - sleep 60 - - ceph orch ps - - ceph versions - - ceph versions | jq -e '.overall | length == 1' - - ceph versions | jq -e '.overall | keys' | grep $sha1 - -workload-tasks: - sequential: - - workunit: - clients: - all: - - suites/fsstress.sh diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml new file mode 100644 index 00000000000..9b21958bebc --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/fail_fs.yaml @@ -0,0 +1,9 @@ +teuthology: + premerge: | + if not yaml.teuthology.variables.fail_fs then reject() end +upgrade-tasks: + sequential: + - cephadm.shell: + env: [sha1] + host.a: + - ceph config set mgr mgr/orchestrator/fail_fs true \ No newline at end of file diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml new file mode 100644 index 00000000000..2dc4eab6124 --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/5-upgrade-with-workload.yaml @@ -0,0 +1,33 @@ +tasks: +- parallel: + - upgrade-tasks + - workload-tasks + +upgrade-tasks: + sequential: + - cephadm.shell: + env: [sha1] + host.a: + - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force + - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force + - ceph config set global log_to_journald false --force + - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 + - cephadm.shell: + env: [sha1] + host.a: + - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph fs dump; ceph orch upgrade status ; sleep 30 ; done + - ceph orch ps + - ceph versions + - echo "wait for servicemap items w/ changing names to refresh" + - sleep 60 + - ceph orch ps + - ceph versions + - ceph versions | jq -e '.overall | length == 1' + - ceph versions | jq -e '.overall | keys' | grep $sha1 + +workload-tasks: + sequential: + - workunit: + clients: + all: + - suites/fsstress.sh diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-verify.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/6-verify.yaml similarity index 100% rename from qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-verify.yaml rename to qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/6-verify.yaml -- 2.39.5