Skip to content

Fix migration for dev=false and bump rancher versions for migration #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
valaparthvi wants to merge 4 commits into
base: main
Choose a base branch
from
+15 −6
Open

Fix migration for dev=false and bump rancher versions for migration #562

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a475cd6
Support dev=false for migration tests
valaparthvi Jul 2, 2026
fe977c9
Update tests/cypress/latest/e2e/capd_rke2_migration_clusterclass.spec.ts
valaparthvi Jul 2, 2026
e7e09c2
Revert upgrade version bump
valaparthvi Jul 3, 2026
de0717b
Use head build for testing
valaparthvi Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/master-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ jobs:
run: |
if [[ "${{ inputs.grep_test_by_tag }}" =~ "@migration" ]]; then
# Required for migration tests
echo "RANCHER_VERSION=head/2.12" >> ${GITHUB_ENV}
echo "RANCHER_VERSION=prime/2.12.11" >> ${GITHUB_ENV}
Comment thread
valaparthvi marked this conversation as resolved.
Outdated
echo "COMMON_SPECS=$(echo "${{ env.SPECS }}" | tr '\n' ' ')" >> ${GITHUB_ENV}
echo "SPECS=" >> ${GITHUB_ENV}
elif [[ "${{ inputs.grep_test_by_tag }}" =~ "@upgrade" ]]; then
Expand Down Expand Up @@ -558,11 +558,11 @@ jobs:
- name: Set Rancher Manager Upgrade version
if: ${{ contains(inputs.grep_test_by_tag, '@migration') }}
run: |
echo "RANCHER_VERSION=head/2.13" >> ${GITHUB_ENV}

@cpinjani cpinjani Jul 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we keep the version on head, to always test the latest Rancher code

echo "RANCHER_VERSION=prime/2.13.7" >> ${GITHUB_ENV}
- 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:
Expand Down
10 changes: 8 additions & 2 deletions tests/cypress/latest/e2e/capd_rke2_migration_clusterclass.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Comment thread
github-code-quality[bot] marked this conversation as resolved.
Fixed
import {capdResourcesCleanup, capiClusterDeletion, importedRancherv3ClusterDeletion} from "../support/cleanup_support";
import {vars} from '../support/variables';

Expand Down Expand Up @@ -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';
Comment thread
valaparthvi marked this conversation as resolved.
Outdated
cy.checkChart('local', 'Install', vars.turtlesProvidersChartName, turtlesNamespace, {version: providersChartVersion, refreshRepo: true});
})
);

Expand Down
7 changes: 5 additions & 2 deletions tests/cypress/latest/e2e/turtles_chart.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
})
);
Expand All @@ -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});
})
Expand Down
2 changes: 1 addition & 1 deletion tests/cypress/latest/support/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,14 +538,14 @@ 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.`);
}
})

// 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 <div> must be clicked
Expand Down
Loading