Skip to content

Commit 9e2a9b2

Browse files
committed
kOps: Use K8s stable marker as a target for the upgrade test
1 parent 9147492 commit 9e2a9b2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,7 @@ def generate_presubmits_e2e():
23312331
skip_regex=r'\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|HostPort|two.untainted.nodes',
23322332
),
23332333
presubmit_test(
2334-
name="pull-kops-e2e-aws-upgrade-k133-ko133-to-klatest-kolatest-many-addons",
2334+
name="pull-kops-e2e-aws-upgrade-k133-ko133-to-kstable-kolatest-many-addons",
23352335
optional=True,
23362336
distro='u2204',
23372337
networking='cilium',
@@ -2344,7 +2344,7 @@ def generate_presubmits_e2e():
23442344
'KOPS_VERSION_A': "1.33",
23452345
'K8S_VERSION_A': "v1.33.5",
23462346
'KOPS_VERSION_B': "latest",
2347-
'K8S_VERSION_B': "latest",
2347+
'K8S_VERSION_B': "stable",
23482348
'KOPS_SKIP_E2E': '1',
23492349
'KOPS_TEMPLATE': 'tests/e2e/templates/many-addons.yaml.tmpl',
23502350
'KOPS_CONTROL_PLANE_SIZE': '3',

config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2390,7 +2390,7 @@ presubmits:
23902390
testgrid-tab-name: pull-kops-e2e-aws-ipv6-karpenter
23912391

23922392
# {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
2393-
- name: pull-kops-e2e-aws-upgrade-k133-ko133-to-klatest-kolatest-many-addons
2393+
- name: pull-kops-e2e-aws-upgrade-k133-ko133-to-kstable-kolatest-many-addons
23942394
cluster: k8s-infra-kops-prow-build
23952395
branches:
23962396
- master
@@ -2432,7 +2432,7 @@ presubmits:
24322432
- name: KOPS_VERSION_B
24332433
value: "latest"
24342434
- name: K8S_VERSION_B
2435-
value: "latest"
2435+
value: "stable"
24362436
- name: KOPS_SKIP_E2E
24372437
value: "1"
24382438
- name: KOPS_TEMPLATE
@@ -2442,7 +2442,7 @@ presubmits:
24422442
- name: CLOUD_PROVIDER
24432443
value: "aws"
24442444
- name: CLUSTER_NAME
2445-
value: "e2e-3f9ef5afb0-ddea2.test-cncf-aws.k8s.io"
2445+
value: "e2e-1727ac1946-2023e.test-cncf-aws.k8s.io"
24462446
- name: KOPS_STATE_STORE
24472447
value: "s3://k8s-kops-prow"
24482448
- name: KOPS_IRSA
@@ -2459,7 +2459,7 @@ presubmits:
24592459
test.kops.k8s.io/networking: cilium
24602460
testgrid-dashboards: kops-presubmits, presubmits-kops, sig-cluster-lifecycle-kops
24612461
testgrid-days-of-results: '90'
2462-
testgrid-tab-name: pull-kops-e2e-aws-upgrade-k133-ko133-to-klatest-kolatest-many-addons
2462+
testgrid-tab-name: pull-kops-e2e-aws-upgrade-k133-ko133-to-kstable-kolatest-many-addons
24632463

24642464
# {"cloud": "aws", "distro": "u2404", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"}
24652465
- name: presubmit-kops-aws-boskos

0 commit comments

Comments
 (0)