Merge branch 'main' into unify_iso_and_os_images

rancher · Oct 4, 2024 · 9d3cc65 · 9d3cc65
2 parents f88d4b5 + 1e54fa2
commit 9d3cc65
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/tests/README.md b/tests/README.md
@@ -86,6 +86,11 @@
     - **It:** Reset node by deleting the cluster
     - **It:** Create Elemental cluster
 
+## `seed_image.spec.ts`
+
+- **Describe:** Seed images menu testing
+    - **It:** Download from seed images menu
+
 ## `upgrade-operator.spec.ts`
 
 - **Describe:** Elemental operator upgrade tests
@@ -108,6 +113,7 @@
     - **It:** Check OS Versions
     - **It:** Upgrade one node different methods if rke2 or k3s
     - **It:** Cannot create two upgrade groups targeting the same cluster
+    - **It:** Delete Upgrade Group
     - **It:** Delete OS Versions Channels
 
 ## `user.spec.ts`

diff --git a/tests/assets/openqa_elemental_updates_jobgroup.yaml b/tests/assets/openqa_elemental_updates_jobgroup.yaml
@@ -26,6 +26,7 @@
   DESKTOP: "textmode"
   EXCLUDE_MODULES: "suseconnect_scc"
   HDD_1: "SL-Micro.%ARCH%-6.0.0-Default-Updated.qcow2"
+  KEEP_GRUB_TIMEOUT: "0"
   TEST_PASSWORD: Elemental@R00t
   VIDEOMODE: "text"
   YAML_SCHEDULE: schedule/elemental/validate_generate_image.yaml

diff --git a/tests/cypress/latest/e2e/unit_tests/seed_image.spec.ts b/tests/cypress/latest/e2e/unit_tests/seed_image.spec.ts
@@ -15,6 +15,7 @@ limitations under the License.
 import '~/support/commands';
 import filterTests from '~/support/filterTests.js';
 import * as cypressLib from '@rancher-ecp-qa/cypress-library';
+import { isBootType } from '~/support/utils';
 
 filterTests(['main'], () => {
   Cypress.config();
@@ -40,7 +41,7 @@ filterTests(['main'], () => {
       cy.exec('rm -f cypress/downloads/*', { failOnNonZeroExit: false });
       cy.clickNavMenu(["Advanced", "Seed Images"]);
       cy.getBySel(selectors.sortableTableRow).contains('Download').click();
-      cy.verifyDownload('.iso', { contains: true, timeout: 300000, interval: 5000 });
+      cy.verifyDownload(isBootType('iso') ? '.iso' : '.img', { contains: true, timeout: 300000, interval: 5000 });
     });
   });
 });
diff --git a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
@@ -116,6 +116,13 @@ describe('Upgrade tests', () => {
         cy.get('#vs4__listbox').should('not.contain', clusterName);
     }));
 
+    qase(76,
+      it('Delete Upgrade Group', () => {
+        cy.clickNavMenu(['Advanced', 'Update Groups']);
+        cy.deleteAllResources();
+        cy.contains('There are no rows to show');
+    }));
+
     qase(37,
       it('Delete OS Versions Channels', () => {
         cy.clickNavMenu(['Advanced', 'OS Version Channels']);