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 <nia@redhat.com>

diff --git a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
index 2da13af55fc214b6125ce324f97c6cf56082ded7..74ebb1c5f622af980e3583f4f1eddeb6f70e6294 100755 (executable)
--- 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 d52c7d53864c24f5801972b89a779f946a081f00..e386a170a0488bd00bf429dded3f780bfb76e60b 100644 (file)
--- 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 20fbeaf90f80a1a5a1b5c96037171efe181d3c9d..0abead17483d3b76692850fa27c47cba58e09162 100644 (file)
--- 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');