ci/ui: install dev os channel if stable operator

rancher · Nov 2, 2023 · 85c08f9 · 85c08f9
1 parent ddf4114
commit 85c08f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
@@ -41,12 +41,18 @@ describe('Upgrade tests', () => {
   });
 
   filterTests(['upgrade'], () => {
+    // Add dev OS Version Channel if stable operator is installed
+    if (utils.isOperatorVersion('registry.suse.com')) {
+      it('Add dev channel for RKE2 upgrade', () => {
+        cy.addOsVersionChannel('dev');
+      })
+    }
+
     qase(33,
       it('Check OS Versions', () => {
         cy.clickNavMenu(["Advanced", "OS Versions"]);
-        if (utils.isOperatorVersion('dev') || utils.isOperatorVersion('staging')) {
-          cy.contains(new RegExp('Active.*-iso-unstable'), {timeout: 120000})
-        }
+        //if (utils.isOperatorVersion('dev') || utils.isOperatorVersion('staging')) {
+        cy.contains(new RegExp('Active.*-iso-unstable'), {timeout: 120000})
       })
     );
 
@@ -138,7 +144,7 @@ describe('Upgrade tests', () => {
     );
 
     qase(37,
-      it('Delete OS Versions Channels', () => {
+      it.skip('Delete OS Versions Channels', () => {
         cy.clickNavMenu(["Advanced", "OS Version Channels"]);
         cy.deleteAllResources();
         cy.clickNavMenu(["Advanced", "OS Versions"]);

diff --git a/tests/cypress/latest/support/commands.ts b/tests/cypress/latest/support/commands.ts
@@ -399,9 +399,9 @@ Cypress.Commands.add('checkLabelSize', (sizeToCheck) => {
 
 // Add an OS version channel
 Cypress.Commands.add('addOsVersionChannel', (channelVersion) => {
-  let channelRepo = `registry.opensuse.org/isv/rancher/elemental/${channelVersion}/containers/rancher/elemental-teal-channel:latest`;
+  let channelRepo = `registry.opensuse.org/isv/rancher/elemental/${channelVersion}/containers/rancher/elemental-channel:latest`;
   if (channelVersion == "stable") {
-    channelRepo = 'registry.suse.com/rancher/elemental-teal-channel:latest';
+    channelRepo = 'registry.suse.com/rancher/elemental-channel:latest';
   }
   cy.clickNavMenu(["Advanced", "OS Version Channels"]);
   cy.getBySel('masthead-create')