diff --git a/.github/workflows/master-e2e.yaml b/.github/workflows/master-e2e.yaml index b0e763773..854211516 100644 --- a/.github/workflows/master-e2e.yaml +++ b/.github/workflows/master-e2e.yaml @@ -562,7 +562,7 @@ jobs: - name: Set Rancher Manager Upgrade version if: ${{ contains(inputs.grep_test_by_tag, '@upgrade') }} run: | - echo "RANCHER_VERSION=prime-alpha/2.14.3-alpha1" >> ${GITHUB_ENV} + echo "RANCHER_VERSION=prime/2.14.3" >> ${GITHUB_ENV} - name: Upgrade Rancher Manager if: ${{ contains(inputs.grep_test_by_tag, '@migration') || contains(inputs.grep_test_by_tag, '@upgrade') }} env: diff --git a/tests/cypress/latest/e2e/capd_rke2_migration_clusterclass.spec.ts b/tests/cypress/latest/e2e/capd_rke2_migration_clusterclass.spec.ts index 96a890e02..05d86db80 100644 --- a/tests/cypress/latest/e2e/capd_rke2_migration_clusterclass.spec.ts +++ b/tests/cypress/latest/e2e/capd_rke2_migration_clusterclass.spec.ts @@ -12,7 +12,12 @@ limitations under the License. */ import '../support/commands'; -import {getClusterName, isRancherManagerVersion, turtlesNamespace} from '../support/utils'; +import { + getClusterName, + isRancherManagerVersion, + isTurtlesDevChart, + turtlesNamespace +} from '../support/utils'; import {capdResourcesCleanup, capiClusterDeletion, importedRancherv3ClusterDeletion} from "../support/cleanup_support"; import {vars} from '../support/variables'; @@ -123,7 +128,8 @@ describe('Import CAPD RKE2 Class-Cluster for Migration', {tags: '@migration'}, ( if (isRancherManagerVersion('2.13')) { qase(407, it('Create Fleet Provider using provider charts', () => { // Install Rancher Turtles Certified Providers chart with default values - cy.checkChart('local', 'Install', vars.turtlesProvidersChartName, turtlesNamespace); + let providersChartVersion = isTurtlesDevChart ? undefined : '0.25'; + cy.checkChart('local', 'Install', vars.turtlesProvidersChartName, turtlesNamespace, {version: providersChartVersion, refreshRepo: true}); }) ); diff --git a/tests/cypress/latest/e2e/turtles_chart.spec.ts b/tests/cypress/latest/e2e/turtles_chart.spec.ts index 1fb764434..01c2ebd69 100644 --- a/tests/cypress/latest/e2e/turtles_chart.spec.ts +++ b/tests/cypress/latest/e2e/turtles_chart.spec.ts @@ -86,7 +86,10 @@ describe('Install Turtles Chart - @install', {tags: '@install'}, () => { // Used in Pre-migration: For Migration test; turtles will be installed from turtles-chart repo. // dev=true is only applicable for 2.13 or version test is upgrading to. addTurtlesRepo(); - // In Post-migration, chartmuseum repo will be used to install providers chart + // In Post-migration, chartmuseum repo will be used to install providers chart for dev=true and OCI repo for dev=false. + if(!isTurtlesDevChart) { + addTurtlesProvidersRepo(); + } } }) ); @@ -98,7 +101,7 @@ describe('Install Turtles Chart - @install', {tags: '@install'}, () => { } if (isMigration) { - turtlesVersion = '0.24.4' + turtlesVersion = '0.24.5' } cy.checkChart('local', 'Install', 'Rancher Turtles', turtlesNamespace, {version: turtlesVersion}); }) diff --git a/tests/cypress/latest/support/commands.ts b/tests/cypress/latest/support/commands.ts index 26c890ffc..bdd195603 100644 --- a/tests/cypress/latest/support/commands.ts +++ b/tests/cypress/latest/support/commands.ts @@ -538,7 +538,6 @@ Cypress.Commands.add('addRepository', (repositoryName: string, repositoryURL: st } cy.getBySel('async-btn-display-label').click(); cy.wait(1000); - cy.typeInFilter(repositoryName); } else { cy.task('suiteLog', `Repository ${repositoryName} already exists; skipping.`); } @@ -546,6 +545,7 @@ Cypress.Commands.add('addRepository', (repositoryName: string, repositoryURL: st // Make sure the repo is active before leaving // Always press Refresh button as workaround for https://github.com/rancher/rancher/issues/49671 + cy.typeInFilter(repositoryName); cy.getBySel('sortable-table-0-action-button').click(); cy.wait(1000); // On prime 2.13.0-alpha4 the refresh icon selector didn't change but parent
must be clicked