From e227c39547e2bbcc213fb1fa865cdbfc377edaa6 Mon Sep 17 00:00:00 2001 From: Dhairya Parmar Date: Fri, 29 Sep 2023 19:03:18 +0530 Subject: [PATCH 1/3] qa/upgrade/upgraded_client: upgrade nautilus->pacific and pacific->reef Fixes: https://tracker.ceph.com/issues/62953 Signed-off-by: Dhairya Parmar --- .../upgraded_client/branch/nautilus.yaml | 2 + .../upgraded_client/branch/pacific.yaml | 2 + .../upgraded_client/tasks/0-from/pacific.yaml | 53 ---------------- .../{0-from/nautilus.yaml => 0-install.yaml} | 19 +++--- .../upgraded_client/tasks/2-upgrade.yaml | 63 +++++++++++++++++++ .../stress_tests/0-client-upgrade.yaml | 14 ----- .../tasks/{2-workload => 3-workload}/.qa | 0 .../{2-workload => 3-workload}/new_ops/% | 0 .../new_ops/0-clients/fuse-upgrade.yaml | 0 .../new_ops/0-clients/kclient.yaml | 0 .../new_ops/1-client-sanity.yaml | 0 .../{2-workload => 3-workload}/stress_tests/% | 0 .../stress_tests/.qa | 0 .../stress_tests/0-client-upgrade.yaml | 24 +++++++ .../stress_tests/1-tests/.qa | 0 .../stress_tests/1-tests/blogbench.yaml | 0 .../stress_tests/1-tests/dbench.yaml | 0 .../stress_tests/1-tests/fsstress.yaml | 0 .../stress_tests/1-tests/iozone.yaml | 0 .../1-tests/kernel_untar_build.yaml | 0 20 files changed, 103 insertions(+), 74 deletions(-) create mode 100644 qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml create mode 100644 qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml rename qa/suites/fs/upgrade/upgraded_client/tasks/{0-from/nautilus.yaml => 0-install.yaml} (64%) create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/.qa (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/new_ops/% (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/new_ops/0-clients/fuse-upgrade.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/new_ops/0-clients/kclient.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/new_ops/1-client-sanity.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/% (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/.qa (100%) create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/0-client-upgrade.yaml rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/1-tests/.qa (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/1-tests/blogbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/1-tests/dbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/1-tests/fsstress.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/1-tests/iozone.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{2-workload => 3-workload}/stress_tests/1-tests/kernel_untar_build.yaml (100%) diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml new file mode 100644 index 00000000000..9b1db62e47f --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml @@ -0,0 +1,2 @@ +teuthology: + branch: nautilus diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml new file mode 100644 index 00000000000..d86c55a34f9 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml @@ -0,0 +1,2 @@ +teuthology: + branch: pacific diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml deleted file mode 100644 index defb0392259..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml +++ /dev/null @@ -1,53 +0,0 @@ -meta: -- desc: | - install ceph/pacific latest -tasks: -- install: - branch: pacific - exclude_packages: - - cephadm - - ceph-mgr-cephadm - - ceph-immutable-object-cache - - python3-rados - - python3-rgw - - python3-rbd - - python3-cephfs - - ceph-volume - extra_packages: - - python-rados - - python-rgw - - python-rbd - - python-cephfs - # For kernel_untar_build workunit - extra_system_packages: - - bison - - flex - - elfutils-libelf-devel - - openssl-devel - - NetworkManager - - iproute - - util-linux -- print: "**** done installing pacific" -- ceph: - log-ignorelist: - - overall HEALTH_ - - \(FS_ - - \(MDS_ - - \(OSD_ - - \(MON_DOWN\) - - \(CACHE_POOL_ - - \(POOL_ - - \(MGR_DOWN\) - - \(PG_ - - \(SMALLER_PGP_NUM\) - - Monitor daemon marked osd - - Behind on trimming - - Manager daemon - conf: - global: - mon warn on pool no app: false - ms bind msgr2: false -- exec: - osd.0: - - ceph osd set-require-min-compat-client pacific -- print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml similarity index 64% rename from qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml index 02f541eaf30..5b250375a00 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml @@ -1,9 +1,15 @@ -meta: -- desc: | - install ceph/nautilus latest +teuthology: + premerge: | + local branch = yaml.teuthology.branch + yaml_fragment['tasks'][0]['install']['branch'] = tostring(branch) + print_branch = "**** done installing "..tostring(branch) + yaml_fragment['tasks'][1]['print'] = print_branch + local exec = yaml_fragment['tasks'][3]['exec']['osd.0'] + local set_compat = "ceph osd set-require-min-compat-client "..tostring(branch) + py_attrgetter(exec).append(set_compat) tasks: - install: - branch: nautilus + branch: [] exclude_packages: - cephadm - ceph-mgr-cephadm @@ -27,7 +33,7 @@ tasks: - NetworkManager - iproute - util-linux -- print: "**** done installing nautilus" +- print: [] - ceph: log-ignorelist: - overall HEALTH_ @@ -48,6 +54,5 @@ tasks: mon warn on pool no app: false ms bind msgr2: false - exec: - osd.0: - - ceph osd set-require-min-compat-client nautilus + osd.0: [] - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml new file mode 100644 index 00000000000..1ff967d4da6 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml @@ -0,0 +1,63 @@ +teuthology: + premerge: | + local branch = yaml.teuthology.branch + local upgrade_branch = "" + local osd_release = "" + if tostring(branch) == "nautilus" then + upgrade_branch = "pacific" + osd_release = "ceph osd require-osd-release pacific" + elseif tostring(branch) == "pacific" then + upgrade_branch = "reef" + osd_release = "ceph osd require-osd-release reef" + else + error("invalid source branch") + end + yaml_fragment['tasks'][2]['install.upgrade']['mon.a']['branch'] = upgrade_branch + py_attrgetter(yaml_fragment['tasks'][9]['exec']['mon.a']).append(osd_release) +overrides: + ceph: + log-ignorelist: + - scrub mismatch + - ScrubResult + - wrongly marked + - \(POOL_APP_NOT_ENABLED\) + - \(SLOW_OPS\) + - overall HEALTH_ + - \(MON_MSGR2_NOT_ENABLED\) + - slow request + conf: + global: + bluestore warn on legacy statfs: false + bluestore warn on no per pool omap: false + mon: + mon warn on osd down out interval zero: false + +tasks: +- mds_pre_upgrade: +- print: "**** done mds pre-upgrade sequence" +- install.upgrade: + # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons + mon.a: + branch: [] +- print: "**** done install.upgrade the host" +- ceph.restart: + daemons: [mon.*, mgr.*] + mon-health-to-clog: false + wait-for-healthy: false +- ceph.healthy: +- ceph.restart: + daemons: [osd.*] + wait-for-healthy: false + wait-for-osds-up: true +- ceph.stop: [mds.*] +- ceph.restart: + daemons: [mds.*] + wait-for-healthy: false + wait-for-osds-up: true +- exec: + mon.a: + - ceph osd dump -f json-pretty + - ceph versions + - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done +- ceph.healthy: +- print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml deleted file mode 100644 index 2d948af1959..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml +++ /dev/null @@ -1,14 +0,0 @@ -teuthology: - postmerge: - - if not is_fuse() then reject() end -tasks: -- ceph-fuse: - client.0: - mounted: false -- print: "**** done unmount client.0" -- install.upgrade: - client.0: -- print: "**** done install.upgrade on client.0" -- ceph-fuse: - client.0: -- print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/fuse-upgrade.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/fuse-upgrade.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/kclient.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/kclient.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/1-client-sanity.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/1-client-sanity.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/% similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/% diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/0-client-upgrade.yaml new file mode 100644 index 00000000000..d91a2b90790 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/0-client-upgrade.yaml @@ -0,0 +1,24 @@ +teuthology: + premerge: | + local branch = yaml.teuthology.branch + if tostring(branch) == "nautilus" then + yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "pacific" + elseif tostring(branch) == "pacific" then + yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "reef" + else + error("invalid source branch") + end + postmerge: + - if not is_fuse() then reject() end +tasks: +- ceph-fuse: + client.0: + mounted: false +- print: "**** done unmount client.0" +- install.upgrade: + client.0: + branch: [] +- print: "**** done install.upgrade on client.0" +- ceph-fuse: + client.0: +- print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/.qa similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/.qa diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/blogbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/blogbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/dbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/dbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/fsstress.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/fsstress.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/iozone.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/iozone.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/kernel_untar_build.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/kernel_untar_build.yaml From 66fd89a860e3a3258849105d7f9149f5baf804b8 Mon Sep 17 00:00:00 2001 From: Dhairya Parmar Date: Sun, 1 Oct 2023 03:13:18 +0530 Subject: [PATCH 2/3] qa/upgrade/nofs: upgrade pacific->reef Fixes: https://tracker.ceph.com/issues/62953 Signed-off-by: Dhairya Parmar --- qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml index 85814287138..e31e4b43ca8 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml +++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml @@ -23,6 +23,7 @@ tasks: - ceph fs dump - install.upgrade: mon.a: + branch: reef - print: "**** done install.upgrade" - ceph.restart: daemons: [mon.*, mgr.*] From c556c7324763332df62f4d382da02314900f1a60 Mon Sep 17 00:00:00 2001 From: Dhairya Parmar Date: Mon, 6 Nov 2023 19:54:20 +0530 Subject: [PATCH 3/3] qa: refactor client upgrade yamls and other minor touchups * start testing new_ops and stress_tests with both the drivers(i.e. fuse and kclient) therefore moved 0-clients/ from tasks/3-workload/new_ops/ to tasks/ and renamed it to 2-clients/ * since new_ops/ and stress_tests/ now share the common upgrade yaml, moved the tests yamls(in stress_tests/1-tests) directly under 3-workload/stress_tests/ * renamed 1-client-sanity.yaml in new_ops/ to newops.yaml Fixes: https://tracker.ceph.com/issues/62953 Signed-off-by: Dhairya Parmar --- .../fuse-upgrade.yaml} | 1 + .../0-clients => 2-clients}/kclient.yaml | 0 .../upgraded_client/tasks/2-upgrade.yaml | 63 ------------------- .../new_ops/0-clients/fuse-upgrade.yaml | 15 ----- .../{1-client-sanity.yaml => newops.yaml} | 0 .../tasks/3-workload/stress_tests/% | 0 .../tasks/3-workload/stress_tests/1-tests/.qa | 1 - .../stress_tests/{1-tests => }/blogbench.yaml | 0 .../stress_tests/{1-tests => }/dbench.yaml | 0 .../stress_tests/{1-tests => }/fsstress.yaml | 0 .../stress_tests/{1-tests => }/iozone.yaml | 0 .../{1-tests => }/kernel_untar_build.yaml | 0 12 files changed, 1 insertion(+), 79 deletions(-) rename qa/suites/fs/upgrade/upgraded_client/tasks/{3-workload/stress_tests/0-client-upgrade.yaml => 2-clients/fuse-upgrade.yaml} (97%) rename qa/suites/fs/upgrade/upgraded_client/tasks/{3-workload/new_ops/0-clients => 2-clients}/kclient.yaml (100%) delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/fuse-upgrade.yaml rename qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/{1-client-sanity.yaml => newops.yaml} (100%) delete mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/% delete mode 120000 qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/.qa rename qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/{1-tests => }/blogbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/{1-tests => }/dbench.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/{1-tests => }/fsstress.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/{1-tests => }/iozone.yaml (100%) rename qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/{1-tests => }/kernel_untar_build.yaml (100%) diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml similarity index 97% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/0-client-upgrade.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml index d91a2b90790..cb8ac4d4f2d 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/0-client-upgrade.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml @@ -19,6 +19,7 @@ tasks: client.0: branch: [] - print: "**** done install.upgrade on client.0" +- ceph.healthy: - ceph-fuse: client.0: - print: "**** done remount client.0" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/kclient.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml deleted file mode 100644 index 1ff967d4da6..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-upgrade.yaml +++ /dev/null @@ -1,63 +0,0 @@ -teuthology: - premerge: | - local branch = yaml.teuthology.branch - local upgrade_branch = "" - local osd_release = "" - if tostring(branch) == "nautilus" then - upgrade_branch = "pacific" - osd_release = "ceph osd require-osd-release pacific" - elseif tostring(branch) == "pacific" then - upgrade_branch = "reef" - osd_release = "ceph osd require-osd-release reef" - else - error("invalid source branch") - end - yaml_fragment['tasks'][2]['install.upgrade']['mon.a']['branch'] = upgrade_branch - py_attrgetter(yaml_fragment['tasks'][9]['exec']['mon.a']).append(osd_release) -overrides: - ceph: - log-ignorelist: - - scrub mismatch - - ScrubResult - - wrongly marked - - \(POOL_APP_NOT_ENABLED\) - - \(SLOW_OPS\) - - overall HEALTH_ - - \(MON_MSGR2_NOT_ENABLED\) - - slow request - conf: - global: - bluestore warn on legacy statfs: false - bluestore warn on no per pool omap: false - mon: - mon warn on osd down out interval zero: false - -tasks: -- mds_pre_upgrade: -- print: "**** done mds pre-upgrade sequence" -- install.upgrade: - # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons - mon.a: - branch: [] -- print: "**** done install.upgrade the host" -- ceph.restart: - daemons: [mon.*, mgr.*] - mon-health-to-clog: false - wait-for-healthy: false -- ceph.healthy: -- ceph.restart: - daemons: [osd.*] - wait-for-healthy: false - wait-for-osds-up: true -- ceph.stop: [mds.*] -- ceph.restart: - daemons: [mds.*] - wait-for-healthy: false - wait-for-osds-up: true -- exec: - mon.a: - - ceph osd dump -f json-pretty - - ceph versions - - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done -- ceph.healthy: -- print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/fuse-upgrade.yaml deleted file mode 100644 index 012969022a4..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/0-clients/fuse-upgrade.yaml +++ /dev/null @@ -1,15 +0,0 @@ -teuthology: - postmerge: - - if not is_fuse() then reject() end -tasks: -- ceph-fuse: - client.0: - mounted: false -- print: "**** done unmount client.0" -- install.upgrade: - client.0: -- print: "**** done install.upgrade on client.0" -- ceph.healthy: -- ceph-fuse: - client.0: -- print: "**** done remount client" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/1-client-sanity.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/blogbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/dbench.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/fsstress.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/iozone.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml similarity index 100% rename from qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/1-tests/kernel_untar_build.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml