From 2ad293b23e6a13897bb098cd6e03f6c9e16a22ba Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 10 Mar 2022 12:40:34 +0100 Subject: [PATCH] qa/suites: clean up client-upgrade-octopus-pacific test - fix .qa symlinks - rename nautilus-client-x.yaml to octopus-client-x.yaml - fix typos and remove stale comment - remove 2-features permutation (it doesn't do anything useful as the workunit is run with RBD_FEATURES environment variable set and those features are explicitly passed to RBD.create and RBD.clone calls; the net effect is that the exact same job is run twice) Signed-off-by: Ilya Dryomov --- .../client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa | 2 +- .../octopus-client-x/rbd/0-cluster/start.yaml | 2 -- .../{nautilus-client-x.yaml => octopus-client-x.yaml} | 2 +- .../octopus-client-x/rbd/2-features/defaults.yaml | 6 ------ .../octopus-client-x/rbd/2-features/layering.yaml | 6 ------ .../octopus-client-x/rbd/{2-features => 2-workload}/.qa | 0 .../{3-workload => 2-workload}/rbd_notification_tests.yaml | 0 .../octopus-client-x/rbd/3-workload/.qa | 1 - 8 files changed, 2 insertions(+), 17 deletions(-) rename qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/{nautilus-client-x.yaml => octopus-client-x.yaml} (86%) delete mode 100644 qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml delete mode 100644 qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml rename qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/{2-features => 2-workload}/.qa (100%) rename qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/{3-workload => 2-workload}/rbd_notification_tests.yaml (100%) delete mode 120000 qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa index a602a0353e75..a23f7e045836 120000 --- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa +++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa @@ -1 +1 @@ -../.qa/ \ No newline at end of file +../../.qa \ No newline at end of file diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml index d8910de2c36b..96af0cb0eed4 100644 --- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml +++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml @@ -16,6 +16,4 @@ roles: - - client.1 overrides: ceph: - #log-ignorelist: - #- failed to encode map fs: xfs diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/octopus-client-x.yaml similarity index 86% rename from qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml rename to qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/octopus-client-x.yaml index e8758027f781..571799a35202 100644 --- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml +++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/octopus-client-x.yaml @@ -6,6 +6,6 @@ tasks: - install.upgrade: exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1', 'python-ceph'] client.1: -- print: "**** done install.upgrade to -x on client.0" +- print: "**** done install.upgrade to -x on client.1" - ceph: - print: "**** done ceph task" diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml deleted file mode 100644 index dff6623ad03d..000000000000 --- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd default features: 61 - diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml deleted file mode 100644 index 5613d0155abc..000000000000 --- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd default features: 1 - diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/.qa similarity index 100% rename from qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa rename to qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/.qa diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml similarity index 100% rename from qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml rename to qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file -- 2.47.3