Skip to content

Commit 6a6d8c2

Browse files
valaparthvivalaparthvi
committed
Cosmetic changes
Signed-off-by: Parthvi Vala <parthvi.vala@suse.com>
1 parent 97b1c5a commit 6a6d8c2

13 files changed

+27
-63
lines changed

‎tests/cypress/latest/e2e/capa_eks_clusterclass.spec.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ describe('Import CAPA EKS Class-Cluster', {tags: '@full'}, () => {
1111
const clusterName = getClusterName(classNamePrefix)
1212
const classesPath = 'examples/clusterclasses/aws/eks'
1313
const clusterClassRepoName = 'aws-eks-clusterclass'
14+
const classClusterFileName = isAPIv1beta1 ? './fixtures/aws/capa-eks-class-cluster-v1beta1.yaml' : './fixtures/aws/capa-eks-class-cluster.yaml'
15+
1416
const providerName = 'aws'
1517
const accessKey = Cypress.env('aws_access_key')
1618
const secretKey = Cypress.env('aws_secret_key')
1719

18-
let classClusterFileName = './fixtures/aws/capa-eks-class-cluster.yaml'
19-
if (isAPIv1beta1) {
20-
classClusterFileName = './fixtures/aws/capa-eks-class-cluster-v1beta1.yaml'
21-
}
22-
2320
beforeEach(() => {
2421
cy.login();
2522
cy.burgerMenuOperate('open');

‎tests/cypress/latest/e2e/capa_kubeadm_clusterclass.spec.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ describe('Import CAPA Kubeadm Class-Cluster', {tags: '@full'}, () => {
1111
const clusterName = getClusterName(classNamePrefix)
1212
const classesPath = 'examples/clusterclasses/aws/kubeadm'
1313
const clusterClassRepoName = 'aws-kb-clusterclass'
14+
const classClusterFileName = isAPIv1beta1 ? './fixtures/aws/capa-kubeadm-class-cluster-v1beta1.yaml' : './fixtures/aws/capa-kubeadm-class-cluster.yaml'
15+
1416
const providerName = 'aws'
1517
const accessKey = Cypress.env('aws_access_key')
1618
const secretKey = Cypress.env('aws_secret_key')
17-
let classClusterFileName = './fixtures/aws/capa-kubeadm-class-cluster.yaml'
18-
if (isAPIv1beta1) {
19-
classClusterFileName = './fixtures/aws/capa-kubeadm-class-cluster-v1beta1.yaml'
20-
}
2119

2220
beforeEach(() => {
2321
cy.login();

‎tests/cypress/latest/e2e/capa_rke2_clusterclass.spec.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ describe('Import CAPA RKE2 Class-Cluster', {tags: '@full'}, () => {
1111
const clusterName = getClusterName(classNamePrefix)
1212
const classesPath = 'examples/clusterclasses/aws/rke2'
1313
const clusterClassRepoName = 'aws-rke2-clusterclass'
14+
const classClusterFileName = isAPIv1beta1 ? './fixtures/aws/capa-rke2-class-cluster-v1beta1.yaml' : './fixtures/aws/capa-rke2-class-cluster.yaml'
15+
1416
const providerName = 'aws'
1517
const accessKey = Cypress.env('aws_access_key')
1618
const secretKey = Cypress.env('aws_secret_key')
1719

18-
let classClusterFileName = './fixtures/aws/capa-rke2-class-cluster.yaml'
19-
if (isAPIv1beta1) {
20-
classClusterFileName = './fixtures/aws/capa-rke2-class-cluster-v1beta1.yaml'
21-
}
2220
beforeEach(() => {
2321
cy.login();
2422
cy.burgerMenuOperate('open');

‎tests/cypress/latest/e2e/capd_kubeadm_clusterclass.spec.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ describe('Import CAPD Kubeadm Class-Cluster', {tags: '@short'}, () => {
2525
const clusterName = getClusterName(classNamePrefix)
2626
const classesPath = 'examples/clusterclasses/docker/kubeadm'
2727
const clusterClassRepoName = 'docker-kb-clusterclass'
28+
const classClusterFileName = isAPIv1beta1 ? "./fixtures/docker/capd-kubeadm-class-cluster-v1beta1.yaml" : "./fixtures/docker/capd-kubeadm-class-cluster.yaml"
29+
2830
const dockerRegistryConfigBase64 = btoa(Cypress.env('docker_registry_config'))
29-
let classClusterfileName = "./fixtures/docker/capd-kubeadm-class-cluster.yaml"
30-
if (isAPIv1beta1) {
31-
classClusterfileName = "./fixtures/docker/capd-kubeadm-class-cluster-v1beta1.yaml"
32-
}
31+
3332
beforeEach(() => {
3433
cy.login();
3534
cy.burgerMenuOperate('open');
@@ -62,7 +61,7 @@ describe('Import CAPD Kubeadm Class-Cluster', {tags: '@short'}, () => {
6261
context('[CLUSTER-IMPORT]', () => {
6362
qase(6,
6463
it('Import CAPD Kubeadm class-clusters using YAML', () => {
65-
cy.readFile(classClusterfileName).then((data) => {
64+
cy.readFile(classClusterFileName).then((data) => {
6665
data = data.replace(/replace_cluster_name/g, clusterName)
6766
data = data.replace(/replace_kindVersion/g, vars.kindVersion)
6867
cy.importYAML(data, vars.capiClustersNS)
@@ -145,7 +144,7 @@ describe('Import CAPD Kubeadm Class-Cluster', {tags: '@short'}, () => {
145144

146145
qase(95,
147146
it("Scale up imported CAPD cluster by patching class-cluster yaml", () => {
148-
cy.readFile(classClusterfileName).then((data) => {
147+
cy.readFile(classClusterFileName).then((data) => {
149148
data = data.replace(/replace_cluster_name/g, clusterName)
150149

151150
// workaround; these values need to be re-replaced before applying the scaling changes

‎tests/cypress/latest/e2e/capd_rke2_clusterclass.spec.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@ describe('Import CAPD RKE2 Class-Cluster', {tags: '@short'}, () => {
4040

4141
const classesPath = 'examples/clusterclasses/docker/rke2'
4242
const clusterClassRepoName = "docker-rke2-clusterclass"
43+
const classClusterFileName = isAPIv1beta1 ? "capd-rke2-class-cluster-v1beta1.yaml" : "capd-rke2-class-cluster.yaml"
44+
4345
const dockerAuthUsernameBase64 = btoa(Cypress.env("docker_auth_username"))
4446
const dockerAuthPasswordBase64 = btoa(Cypress.env("docker_auth_password"))
45-
let classClusterfileName = "capd-rke2-class-cluster.yaml"
46-
if (isAPIv1beta1) {
47-
classClusterfileName = "capd-rke2-class-cluster-v1beta1.yaml"
48-
}
47+
4948
beforeEach(() => {
5049
cy.login();
5150
cy.burgerMenuOperate('open');
@@ -77,7 +76,7 @@ describe('Import CAPD RKE2 Class-Cluster', {tags: '@short'}, () => {
7776
context('[CLUSTER-IMPORT]', () => {
7877
qase(29,
7978
it('Import CAPD RKE2 class-clusters using YAML', () => {
80-
cy.readFile(`./fixtures/docker/${classClusterfileName}`).then((data) => {
79+
cy.readFile(`./fixtures/docker/${classClusterFileName}`).then((data) => {
8180
data = data.replace(/replace_cluster_name/g, clusterName)
8281
data = data.replace(/replace_rke2_version/g, vars.rke2Version)
8382
data = data.replace(/replace_kind_version/g, vars.kindVersion)
@@ -122,7 +121,7 @@ describe('Import CAPD RKE2 Class-Cluster', {tags: '@short'}, () => {
122121

123122
qase(8,
124123
it("Scale up imported CAPD cluster by patching class-cluster yaml", () => {
125-
cy.readFile(`./fixtures/docker/${classClusterfileName}`).then((data) => {
124+
cy.readFile(`./fixtures/docker/${classClusterFileName}`).then((data) => {
126125
data = data.replace(/replicas: 2/g, 'replicas: 3')
127126

128127
// workaround; these values need to be re-replaced before applying the scaling changes

‎tests/cypress/latest/e2e/capd_rke2_fleet_clusterclass.spec.ts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@ describe('Import CAPD RKE2 Class-Cluster', {tags: '@short'}, () => {
2222
let clusterName: string
2323
const timeout = vars.shortTimeout
2424
const classNamePrefix = 'docker-rke2'
25-
let path = '/tests/assets/rancher-turtles-fleet-example/capd/rke2/class-clusters'
26-
if (isAPIv1beta1) {
27-
path = '/tests/assets/rancher-turtles-fleet-example/capd/rke2/class-clusters-v1beta1'
28-
}
29-
const branch = vars.branch
30-
let classesPath = 'examples/clusterclasses/docker/rke2'
31-
if (isAPIv1beta1) {
32-
classesPath = 'examples/clusterclasses/docker/rke2-v1beta1'
33-
}
25+
const path = isAPIv1beta1 ? '/tests/assets/rancher-turtles-fleet-example/capd/rke2/class-clusters-v1beta1' : '/tests/assets/rancher-turtles-fleet-example/capd/rke2/class-clusters'
26+
const classesPath = 'examples/clusterclasses/docker/rke2'
3427
const clustersRepoName = 'docker-rke2-class-clusters'
3528
const clusterClassRepoName = "docker-rke2-clusterclass"
3629
const dockerAuthUsernameBase64 = btoa(Cypress.env("docker_auth_username"))

‎tests/cypress/latest/e2e/capd_rke2_migration_clusterclass.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ describe('Import CAPD RKE2 Class-Cluster for Migration', {tags: '@migration'}, (
4444

4545
it('Create Docker CAPIProvider & Calico CNI HelmOp', () => {
4646
// Calico CNI HelmOp
47-
cy.addFleetGitRepo('calico-cni', vars.turtlesRepoUrl, vars.branch, 'examples/applications/cni/calico', vars.capiClustersNS)
47+
cy.addFleetGitRepo('calico-cni', vars.turtlesRepoUrl, vars.classbranch, 'examples/applications/cni/calico', vars.capiClustersNS)
4848

4949
// Docker rke2 lb-config
5050
cy.burgerMenuOperate('open');
51-
cy.addFleetGitRepo('lb-docker', vars.turtlesRepoUrl, vars.branch, 'examples/applications/lb/docker', vars.capiClustersNS)
51+
cy.addFleetGitRepo('lb-docker', vars.turtlesRepoUrl, vars.classbranch, 'examples/applications/lb/docker', vars.capiClustersNS)
5252

5353
// Create Docker provider
5454
cy.createCAPIProvider(capdProviderName);

‎tests/cypress/latest/e2e/capg_kubeadm_clusterclass.spec.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ describe('Import CAPG Kubeadm Class-Cluster', {tags: '@full'}, () => {
1212
const clusterName = getClusterName(classNamePrefix)
1313
const classesPath = 'examples/clusterclasses/gcp/kubeadm'
1414
const clusterClassRepoName = 'gcp-kubeadm-clusterclass'
15-
const gcpProject = Cypress.env("gcp_project")
15+
const classClusterFileName = isAPIv1beta1 ? './fixtures/gcp/capg-kubeadm-class-cluster-v1beta1.yaml' : './fixtures/gcp/capg-kubeadm-class-cluster.yaml'
1616

17-
let classClusterFileName = './fixtures/gcp/capg-kubeadm-class-cluster.yaml'
18-
if (isAPIv1beta1) {
19-
classClusterFileName = './fixtures/gcp/capg-kubeadm-class-cluster-v1beta1.yaml'
20-
}
17+
const gcpProject = Cypress.env("gcp_project")
2118

2219
beforeEach(() => {
2320
cy.login();

‎tests/cypress/latest/e2e/capv_kubeadm_clusterclass.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ describe('Import CAPV Kubeadm Class-Cluster', {tags: '@vsphere'}, () => {
1111
const classRepoName = 'vsphere-kb-clusterclass'
1212
const className = 'vsphere-kubeadm-example'
1313
const clusterName = 'turtles-qa-capv-kb-example'
14-
let path = '/tests/assets/rancher-turtles-fleet-example/capv/kubeadm/class-clusters'
15-
if (isAPIv1beta1) {
16-
path = '/tests/assets/rancher-turtles-fleet-example/capv/kubeadm/class-clusters-v1beta1'
17-
}
14+
const path = isAPIv1beta1 ? '/tests/assets/rancher-turtles-fleet-example/capv/kubeadm/class-clusters-v1beta1' : '/tests/assets/rancher-turtles-fleet-example/capv/kubeadm/class-clusters'
1815
const classesPath = 'examples/clusterclasses/vsphere/kubeadm'
1916
const vsphere_secrets_json_base64 = Cypress.env("vsphere_secrets_json_base64")
2017
const providerName = 'vsphere'

‎tests/cypress/latest/e2e/capv_rke2_clusterclass.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ describe('Import CAPV RKE2 Class-Cluster', {tags: '@vsphere'}, () => {
1212
const classRepoName = 'vsphere-rke2-clusterclass'
1313
const className = 'vsphere-rke2-example'
1414
const clusterName = 'turtles-qa-capv-rke2-example'
15-
let path = '/tests/assets/rancher-turtles-fleet-example/capv/rke2/class-clusters'
16-
if (isAPIv1beta1) {
17-
path = '/tests/assets/rancher-turtles-fleet-example/capv/rke2/class-clusters-v1beta1'
18-
}
15+
const path = isAPIv1beta1 ? '/tests/assets/rancher-turtles-fleet-example/capv/rke2/class-clusters-v1beta1' : '/tests/assets/rancher-turtles-fleet-example/capv/rke2/class-clusters'
1916
const classesPath = 'examples/clusterclasses/vsphere/rke2'
2017
const vsphere_secrets_json_base64 = Cypress.env("vsphere_secrets_json_base64")
2118
const providerName = 'vsphere'

0 commit comments

Comments
 (0)