diff options
Diffstat (limited to 'qa/suites/fs/upgrade/upgraded_client/tasks')
18 files changed, 9 insertions, 76 deletions
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml deleted file mode 100644 index 02f541eaf..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml +++ /dev/null @@ -1,53 +0,0 @@ -meta: -- desc: | - install ceph/nautilus latest -tasks: -- install: - branch: nautilus - 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 nautilus" -- 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 nautilus -- print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml index defb03922..356f87787 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/pacific latest + install ceph/quincy latest tasks: - install: - branch: pacific + branch: quincy exclude_packages: - cephadm - ceph-mgr-cephadm @@ -27,7 +27,7 @@ tasks: - NetworkManager - iproute - util-linux -- print: "**** done installing pacific" +- print: "**** done installing quincy" - ceph: log-ignorelist: - overall HEALTH_ @@ -49,5 +49,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client pacific -- print: "**** done ceph" + - ceph osd set-require-min-compat-client quincy +- print: "**** done ceph"
\ No newline at end of file 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/2-clients/fuse-upgrade.yaml index 34c85a00e..bed83610f 100644 --- 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/2-clients/fuse-upgrade.yaml @@ -9,6 +9,7 @@ tasks: - install.upgrade: client.0: - print: "**** done install.upgrade on client.0" +- ceph.healthy: - ceph-fuse: client.0: -- print: "**** done remount client" +- print: "**** done remount client.0" 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/2-clients/kclient.yaml index ecc705600..ecc705600 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/
\ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% deleted file mode 100644 index e69de29bb..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% +++ /dev/null diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/
\ No newline at end of file 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 2d948af19..000000000 --- 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/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-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/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa new file mode 120000 index 000000000..fea2489fd --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa @@ -0,0 +1 @@ +../.qa
\ No newline at end of file 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/% index e69de29bb..e69de29bb 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% +++ b/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/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml index 9508cce65..9508cce65 100644 --- 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/newops.yaml diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa new file mode 120000 index 000000000..fea2489fd --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa @@ -0,0 +1 @@ +../.qa
\ No newline at end of file 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/blogbench.yaml index a2f8b3052..a2f8b3052 120000 --- 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/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/dbench.yaml index 9fb8adcea..9fb8adcea 120000 --- 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/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/fsstress.yaml index dc777f36d..dc777f36d 120000 --- 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/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/iozone.yaml index f4d0ead4f..f4d0ead4f 120000 --- 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/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/kernel_untar_build.yaml index 317ebf8c4..317ebf8c4 120000 --- 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/kernel_untar_build.yaml |