mgr/dashboard: cephadm e2e job: set static ip to VM

- Set static IPs to VMs.
- Remove domain in cluster definition to avoid side effects of potential dns misconfiguration.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>

src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh

@@ -22,9 +22,9 @@ fsid=$(cat /etc/ceph/ceph.conf | grep fsid | awk '{ print $3}')
 cephadm_shell="cephadm shell --fsid ${fsid} -c /etc/ceph/ceph.conf -k /etc/ceph/ceph.client.admin.keyring"
 
 {% for number in range(1, nodes) %}
-  ssh-copy-id -f -i /etc/ceph/ceph.pub  -o StrictHostKeyChecking=no root@{{ prefix }}-node-0{{ number }}.{{ domain }}
+  ssh-copy-id -f -i /etc/ceph/ceph.pub  -o StrictHostKeyChecking=no root@{{ prefix }}-node-0{{ number }}
   {% if expanded_cluster is defined %}
-    ${cephadm_shell} ceph orch host add {{ prefix }}-node-0{{ number }}.{{ domain }}
+    ${cephadm_shell} ceph orch host add {{ prefix }}-node-0{{ number }}
   {% endif %}
 {% endfor %}
 

src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml

@@ -1,8 +1,10 @@
 parameters:
  nodes: 4
+ node_ip_offset: 100
  pool: ceph-dashboard
  network: ceph-dashboard
- domain: cephlab.com
+ gateway: 192.168.100.1
+ netmask: 255.255.255.0
  prefix: ceph
  numcpus: 1
  memory: 2048
@@ -21,9 +23,12 @@ parameters:
  reserveip: true
  reservedns: true
  sharedkey: true
- domain: {{ domain }}
  nets:
-  - {{ network }}
+  - name: {{ network }}
+    ip: 192.168.100.{{ node_ip_offset + number }}
+    gateway: {{ gateway }}
+    mask: {{ netmask }}
+    dns: {{ gateway }}
  disks: {{ disks }}
  pool: {{ pool }}
  sharedfolders: [{{ ceph_dev_folder }}]

src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/02-create-cluster-add-host.e2e-spec.ts

@@ -7,10 +7,10 @@ describe('Create cluster add host page', () => {
   const createCluster = new CreateClusterWizardHelper();
   const createClusterHostPage = new CreateClusterHostPageHelper();
   const hostnames = [
-    'ceph-node-00.cephlab.com',
-    'ceph-node-01.cephlab.com',
-    'ceph-node-02.cephlab.com',
-    'ceph-node-[01-03].cephlab.com'
+    'ceph-node-00',
+    'ceph-node-01',
+    'ceph-node-02',
+    'ceph-node-[01-03]'
   ];
   const addHost = (hostname: string, exist?: boolean, pattern?: boolean, labels: string[] = []) => {
     cy.get('.btn.btn-accent').first().click({ force: true });

src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/06-cluster-check.e2e-spec.ts

@@ -25,10 +25,10 @@ describe('when cluster creation is completed', () => {
   describe('Hosts page', () => {
     const hosts = new HostsPageHelper();
     const hostnames = [
-      'ceph-node-00.cephlab.com',
-      'ceph-node-01.cephlab.com',
-      'ceph-node-02.cephlab.com',
-      'ceph-node-03.cephlab.com'
+      'ceph-node-00',
+      'ceph-node-01',
+      'ceph-node-02',
+      'ceph-node-03'
     ];
 
     beforeEach(() => {