Skip to content

Commit 4922434

Browse files
authored
Merge pull request #15001 from rak-phillip/task/2.11/staging-registry
[2.11] Migrate to staging registry for e2e tests
2 parents 4a846c2 + d803ecd commit 4922434

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

cypress/e2e/po/pages/explorer/charts/chart.po.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ export class ChartPage extends PagePo {
4747
return new BannersPo('[data-testid="deprecation-and-experimental-banner"]', this.self());
4848
}
4949

50+
versions() {
51+
return this.self().find('.chart-content__right-bar__section--cVersion a');
52+
}
53+
5054
selectVersion(version: string) {
5155
return this.self().find('.chart-content__right-bar__section--cVersion').contains(version).click();
5256
}

cypress/e2e/tests/pages/explorer/apps/charts.spec.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,13 @@ describe('Apps/Charts', { tags: ['@explorer', '@adminUser'] }, () => {
112112
// Set up intercept for the network request triggered by $fetch
113113
cy.intercept('GET', '**/v1/catalog.cattle.io.clusterrepos/**').as('fetchChartDataAfterSelect');
114114

115-
chartPage.selectVersion('105.1.0+up4.10.0');
115+
chartPage.versions()
116+
.first()
117+
.then((firstVersion) => {
118+
chartPage.selectVersion(firstVersion.text());
116119

117-
cy.wait('@fetchChartDataAfterSelect').its('response.statusCode').should('eq', 200);
120+
cy.wait('@fetchChartDataAfterSelect').its('response.statusCode').should('eq', 200);
121+
});
118122
});
119123

120124
it('should not call fetch when navigating back to charts page', () => {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"install:ci": "yarn install --frozen-lockfile",
2727
"dev": "bash -c 'source ./scripts/version && NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve'",
2828
"mem-dev": "bash -c 'source ./scripts/version && NODE_ENV=dev node --max-old-space-size=8192 ./node_modules/.bin/vue-cli-service serve'",
29-
"docker:local:start": "docker run -d --restart=unless-stopped -p 80:80 -p 443:443 -e CATTLE_BOOTSTRAP_PASSWORD=password -e CATTLE_PASSWORD_MIN_LENGTH=3 --name cypress --privileged rancher/rancher:v2.11-head",
29+
"docker:local:start": "docker run -d --restart=unless-stopped -p 80:80 -p 443:443 -e CATTLE_BOOTSTRAP_PASSWORD=password -e CATTLE_PASSWORD_MIN_LENGTH=3 --name cypress --privileged stgregistry.suse.com/rancher/rancher:v2.11-head",
3030
"docker:local:stop": "docker kill cypress || true && docker rm cypress || true",
3131
"build": "NODE_OPTIONS=--max_old_space_size=4096 ./node_modules/.bin/vue-cli-service build",
3232
"build:lib": "cd pkg/rancher-components && yarn build:lib",

scripts/e2e-docker-start

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ docker run -d --restart=unless-stopped -p 80:80 -p 443:443 ${VOLUME_ARGS} \
2727
-e CATTLE_PASSWORD_MIN_LENGTH=3 \
2828
--name cypress \
2929
--privileged \
30-
rancher/rancher:${RANCHER_IMG_VERSION}
30+
stgregistry.suse.com/rancher/rancher:${RANCHER_IMG_VERSION}
3131

3232
docker ps
3333

0 commit comments

Comments
 (0)