From 347fb2e8fe26020a4693d3bbd94ca007c7e3535a Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Fri, 28 Jan 2022 19:23:31 +0530 Subject: [PATCH] mgr/dashboard: fix for cephadm e2e failing because of rgw commands getting stuck Delaying the rgw service creation in the tests until the cluster is healthy also changing the node_ip_offset to 110 because in the jenkins I saw Fixes: https://tracker.ceph.com/issues/54030 Signed-off-by: Nizamudeen A --- src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh | 1 + .../03-create-cluster-create-services.e2e-spec.ts | 11 +++++------ .../orchestrator/workflow/08-hosts.e2e-spec.ts | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh index 2da13af55fc21..74ebb1c5f622a 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh @@ -7,6 +7,7 @@ cleanup() { if [[ -n "$JENKINS_HOME" ]]; then printf "\n\nStarting cleanup...\n\n" kcli delete plan -y ceph || true + kcli delete network ceph-dashboard -y docker container prune -f printf "\n\nCleanup completed.\n\n" fi diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/03-create-cluster-create-services.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/03-create-cluster-create-services.e2e-spec.ts index d52c7d53864c2..e386a170a0488 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/03-create-cluster-create-services.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/03-create-cluster-create-services.e2e-spec.ts @@ -26,20 +26,19 @@ describe('Create cluster create services page', () => { }); describe('when Orchestrator is available', () => { - const serviceName = 'rgw.foo'; + const serviceName = 'mds.test'; - it('should create an rgw and mds service', () => { - createService('rgw', serviceName, '2'); - createService('mds', 'mds.test'); + it('should create an mds service', () => { + createService('mds', serviceName, '1'); }); it('should edit a service', () => { - const daemonCount = '4'; + const daemonCount = '2'; createClusterServicePage.editService(serviceName, daemonCount); createClusterServicePage.expectPlacementCount(serviceName, daemonCount); }); - it('should delete the mds service', () => { + it('should delete mds service', () => { createClusterServicePage.deleteService('mds.test'); }); }); diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/08-hosts.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/08-hosts.e2e-spec.ts index 20fbeaf90f80a..0abead17483d3 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/08-hosts.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/08-hosts.e2e-spec.ts @@ -14,6 +14,12 @@ describe('Host Page', () => { }); // rgw is needed for testing the force maintenance + it('should create rgw services', () => { + services.navigateTo('create'); + services.addService('rgw', false, '4'); + services.checkExist('rgw.foo', true); + }); + it('should check if rgw daemon is running on all hosts', () => { for (const hostname of hostnames) { hosts.clickTab('cd-host-details', hostname, 'Daemons'); -- 2.39.5