ci/ui: add test for dhcp hostname

rancher · Feb 26, 2024 · 89304c5 · 89304c5
1 parent 0105924
commit 89304c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/tests/cypress/latest/e2e/unit_tests/machine_inventory.spec.ts b/tests/cypress/latest/e2e/unit_tests/machine_inventory.spec.ts
@@ -29,6 +29,9 @@ describe('Machine inventory testing', () => {
   const proxy         = "http://172.17.0.1:3128"
   const uiAccount     = Cypress.env('ui_account');
   const uiPassword    = "rancherpassword"
+  let hostname        = ""
+  // Test if machine inventory uses hostname given by DHCP
+  utils.isK8sVersion("k3s") && utils.isCypressTag("main") ? hostname=('node-001') : hostname=('my-machine');
 
   beforeEach(() => {
     (uiAccount == "user") ? cy.login(elementalUser, uiPassword) : cy.login();
@@ -50,15 +53,15 @@ describe('Machine inventory testing', () => {
           .contains('Active')
           .should('exist');
         cy.getBySel('sortable-cell-0-1')
-          .contains('my-machine')
+          .contains(hostname)
           .should('exist');
       })
     );
 
     qase(29,
       it('Check we can see our embedded hardware labels', () => {
         cy.clickNavMenu(["Inventory of Machines"]);
-        cy.contains('my-machine')
+        cy.contains(hostname)
           .click()
         cy.checkMachInvLabel('machine-registration', 'myInvLabel1', 'myInvLabelValue1', true);
         for (const key in hwLabels) {

diff --git a/tests/cypress/latest/fixtures/custom_cloud-config_with_reset.yaml b/tests/cypress/latest/fixtures/custom_cloud-config_with_reset.yaml
@@ -15,4 +15,4 @@ config:
       reset-oem: true
       power-off: false
       reboot: true
-machineName: my-machine
+machineName: ${System Data/Runtime/Hostname}