From 55a846928ff67289fadb8512c6964227bc967f8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alfonso=20Mart=C3=ADnez?= Date: Wed, 17 Nov 2021 13:18:26 +0100 Subject: [PATCH] mgr/dashboard: NFS non-existent files cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit After https://github.com/ceph/ceph/pull/42526 and https://github.com/ceph/ceph/pull/43725 merges, the following files do not exist but there were still references to them: - src/pybind/mgr/dashboard/services/ganesha.py - qa/tasks/mgr/dashboard/test_ganesha.py The following files were renamed but there were still references to old names: - src/pybind/mgr/dashboard/controllers/nfsganesha.py: nfsganesha.py --> nfs.py - src/pybind/mgr/dashboard/tests/test_ganesha.py: test_ganesha.py --> test_nfs.py Other changes in qa/suites/rados/dashboard/tasks/dashboard.yaml: - Add missing task: tasks.mgr.dashboard.test_api - Sort dashboard tasks alphabetically. Fixes: https://tracker.ceph.com/issues/53123 Signed-off-by: Alfonso Martínez (cherry picked from commit 045d2d0f7656e8524bbb32b5d9c230ca1f9b8d1c) --- .github/labeler.yml | 5 ++--- qa/suites/rados/dashboard/tasks/dashboard.yaml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index a9c6a1179da..b8a66602c98 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -230,10 +230,9 @@ nfs: - src/pybind/mgr/nfs/** - src/pybind/mgr/cephadm/services/nfs.py - src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 - - src/pybind/mgr/dashboard/services/ganesha.py - - src/pybind/mgr/dashboard/tests/test_ganesha.py + - src/pybind/mgr/dashboard/controllers/nfs.py + - src/pybind/mgr/dashboard/tests/test_nfs.py - qa/tasks/cephfs/test_nfs.py - - qa/tasks/mgr/dashboard/test_ganesha.py - doc/mgr/nfs.rst - doc/cephfs/nfs.rst - doc/cephadm/nfs.rst diff --git a/qa/suites/rados/dashboard/tasks/dashboard.yaml b/qa/suites/rados/dashboard/tasks/dashboard.yaml index 0a6076cabe9..01b3ecd906f 100644 --- a/qa/suites/rados/dashboard/tasks/dashboard.yaml +++ b/qa/suites/rados/dashboard/tasks/dashboard.yaml @@ -33,18 +33,19 @@ tasks: fail_on_skip: false modules: - tasks.mgr.test_dashboard + - tasks.mgr.dashboard.test_api - tasks.mgr.dashboard.test_auth - tasks.mgr.dashboard.test_cephfs - - tasks.mgr.dashboard.test_cluster_configuration - tasks.mgr.dashboard.test_cluster + - tasks.mgr.dashboard.test_cluster_configuration - tasks.mgr.dashboard.test_crush_rule - tasks.mgr.dashboard.test_erasure_code_profile - - tasks.mgr.dashboard.test_ganesha - tasks.mgr.dashboard.test_health - tasks.mgr.dashboard.test_host - tasks.mgr.dashboard.test_logs - tasks.mgr.dashboard.test_mgr_module - tasks.mgr.dashboard.test_monitor + - tasks.mgr.dashboard.test_motd - tasks.mgr.dashboard.test_orchestrator - tasks.mgr.dashboard.test_osd - tasks.mgr.dashboard.test_perf_counters @@ -58,4 +59,3 @@ tasks: - tasks.mgr.dashboard.test_summary - tasks.mgr.dashboard.test_telemetry - tasks.mgr.dashboard.test_user - - tasks.mgr.dashboard.test_motd -- 2.47.3