diff --git a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts index 76873d8c1..300fdf529 100644 --- 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 index 04f31e73b..6ced0a826 100644 --- 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')