Skip to content

Commit cc9cea8

Browse files
upodroidupodroid
committed
add 1.35 k8s/kops jobs and fix broken distro jobs
1 parent 0ddd49f commit cc9cea8

16 files changed

+56007
-31023
lines changed

‎config/jobs/kubernetes/kops/build_jobs.py‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
gce_distro_options,
4949
aws_distro_options,
5050
k8s_versions,
51-
kops_versions,
5251
network_plugins_periodics,
5352
network_plugins_presubmits,
5453
upgrade_versions_list,
@@ -268,6 +267,8 @@ def build_test(cloud='aws',
268267
]
269268
if cloud == 'gce':
270269
dashboards.extend(['kops-gce'])
270+
if cloud == 'azure':
271+
dashboards.extend(['kops-azure'])
271272

272273
if extra_dashboards:
273274
dashboards.extend(extra_dashboards)
@@ -485,8 +486,8 @@ def generate_grid():
485486
results = []
486487
# pylint: disable=too-many-nested-blocks
487488
for networking in network_plugins_periodics['supports_aws']:
488-
for distro in aws_distro_options:
489-
for k8s_version in k8s_versions:
489+
for distro, kops_versions in aws_distro_options.items():
490+
for k8s_version in [v for v in k8s_versions if v != 'master']:
490491
for kops_version in kops_versions:
491492
networking_arg = networking.replace('amazon-vpc', 'amazonvpc').replace('kuberouter', 'kube-router')
492493
distro_short = distro_shortener(distro)
@@ -511,8 +512,8 @@ def generate_grid():
511512
)
512513

513514
for networking in network_plugins_periodics['supports_gce']:
514-
for distro in gce_distro_options:
515-
for k8s_version in k8s_versions:
515+
for distro, kops_versions in gce_distro_options.items():
516+
for k8s_version in [v for v in k8s_versions if v != 'master']:
516517
for kops_version in kops_versions:
517518
distro_short = distro_shortener(distro)
518519
extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
@@ -1286,12 +1287,11 @@ def generate_misc():
12861287
################################
12871288
def generate_conformance():
12881289
results = []
1289-
for version in ['master', '1.34', '1.33', '1.32']:
1290+
for version in k8s_versions:
12901291
results.append(
12911292
build_test(
12921293
cloud='aws',
12931294
k8s_version=version.replace('master', 'ci'),
1294-
kops_version=version,
12951295
kops_channel='alpha',
12961296
name_override=f"kops-aws-conformance-{version.replace('.', '-')}",
12971297
networking='calico',
@@ -1311,7 +1311,6 @@ def generate_conformance():
13111311
build_test(
13121312
cloud='aws',
13131313
k8s_version=version.replace('master', 'ci'),
1314-
kops_version=version,
13151314
kops_channel='alpha',
13161315
name_override=f"kops-aws-conformance-arm64-{version.replace('.', '-')}",
13171316
networking='calico',
@@ -1331,7 +1330,6 @@ def generate_conformance():
13311330
build_test(
13321331
cloud='azure',
13331332
k8s_version=version.replace('master', 'ci'),
1334-
kops_version=version,
13351333
kops_channel='alpha',
13361334
name_override=f"kops-azure-conformance-{version.replace('.', '-')}",
13371335
networking='kindnet',
@@ -1352,7 +1350,7 @@ def generate_conformance():
13521350
###############################
13531351
def generate_distros():
13541352
results = []
1355-
for distro in aws_distro_options:
1353+
for distro, _ in aws_distro_options.items():
13561354
distro_short = distro_shortener(distro)
13571355
extra_flags = []
13581356
if 'arm64' in distro:
@@ -1384,7 +1382,7 @@ def generate_distros():
13841382
###############################
13851383
def generate_presubmits_distros():
13861384
results = []
1387-
for distro in aws_distro_options:
1385+
for distro, _ in aws_distro_options.items():
13881386
distro_short = distro_shortener(distro)
13891387
extra_flags = []
13901388
if 'arm64' in distro:
@@ -1410,7 +1408,7 @@ def generate_presubmits_distros():
14101408
always_run=False,
14111409
)
14121410
)
1413-
for distro in gce_distro_options:
1411+
for distro, _ in gce_distro_options.items():
14141412
distro_short = distro_shortener(distro)
14151413
extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
14161414
if 'arm64' in distro:
@@ -1708,6 +1706,7 @@ def generate_presubmits_scale():
17081706
networking='gce',
17091707
cloud="gce",
17101708
always_run=False,
1709+
run_if_changed=r'^tests\/e2e\/scenarios\/scalability\/run-test.sh',
17111710
artifacts='$(ARTIFACTS)',
17121711
test_timeout_minutes=450,
17131712
env={
@@ -1774,7 +1773,7 @@ def generate_presubmits_scale():
17741773
#################################
17751774
def generate_nftables():
17761775
results = []
1777-
for distro in aws_distro_options:
1776+
for distro, _ in aws_distro_options.items():
17781777
distro_short = distro_shortener(distro)
17791778
extra_flags = ["--set=cluster.spec.kubeProxy.proxyMode=nftables"]
17801779
if 'arm64' in distro:
@@ -1796,7 +1795,7 @@ def generate_nftables():
17961795
runs_per_day=3,
17971796
)
17981797
)
1799-
for distro in gce_distro_options:
1798+
for distro, _ in gce_distro_options.items():
18001799
distro_short = distro_shortener(distro)
18011800
extra_flags = [
18021801
"--set=cluster.spec.kubeProxy.proxyMode=nftables",
@@ -1833,18 +1832,8 @@ def generate_nftables():
18331832
# kops-periodics-versions.yaml #
18341833
################################
18351834
def generate_versions():
1836-
results = [
1837-
build_test(
1838-
build_cluster='k8s-infra-kops-prow-build',
1839-
k8s_version='ci',
1840-
kops_channel='alpha',
1841-
name_override='kops-aws-k8s-latest',
1842-
networking='calico',
1843-
extra_dashboards=['kops-versions'],
1844-
runs_per_day=8,
1845-
)
1846-
]
1847-
for version in ['1.34', '1.33', '1.32']:
1835+
results = []
1836+
for version in k8s_versions:
18481837
results.append(
18491838
build_test(
18501839
cloud='aws',

‎config/jobs/kubernetes/kops/build_vars.py‎

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,12 @@
1919

2020
image = "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251209-13d7d11b0f-master"
2121

22-
# GCE distributions
23-
gce_distro_options = [
24-
"cos121",
25-
"cos121arm64",
26-
"cos125",
27-
"cos125arm64",
28-
"cosdev",
29-
"cosdevarm64",
30-
"debian12",
31-
"debian12arm64",
32-
"debian13",
33-
"debian13arm64",
34-
"ubuntu2204",
35-
"ubuntu2404",
36-
"ubuntu2404arm64",
37-
"ubuntuminimal2404",
38-
"ubuntuminimal2404arm64",
39-
"rocky10",
40-
# "rocky10arm64",
41-
"rhel10",
42-
# "rhel10arm64",
43-
# "fedora43", #https://bugzilla.redhat.com/show_bug.cgi?id=2394063
44-
]
45-
46-
# AWS distributions
47-
aws_distro_options = [
48-
"debian11",
49-
"debian12",
50-
"debian13",
51-
"ubuntu2204",
52-
"ubuntu2204arm64",
53-
"ubuntu2404",
54-
"ubuntu2404arm64",
55-
"ubuntu2510",
56-
"ubuntu2510arm64",
57-
"amazonlinux2",
58-
"al2023",
59-
"al2023arm64",
60-
"rhel9",
61-
"rhel10arm64",
62-
"rocky9",
63-
"rocky10arm64",
64-
"flatcar",
65-
]
66-
6722
k8s_versions = [
23+
"master",
6824
"1.32",
6925
"1.33",
7026
"1.34",
27+
"1.35",
7128
]
7229

7330
# kOps versions tested
@@ -78,6 +35,53 @@
7835
"1.34",
7936
]
8037

38+
def drop_unsupported_versions(original_list, version_to_drop):
39+
return list(filter(lambda item: item not in version_to_drop, original_list))
40+
41+
# AWS distributions
42+
aws_distro_options = {
43+
"debian11": kops_versions,
44+
"debian12": kops_versions,
45+
"debian13": kops_versions,
46+
"ubuntu2204": kops_versions,
47+
"ubuntu2204arm64": kops_versions,
48+
"ubuntu2404": kops_versions,
49+
"ubuntu2404arm64": kops_versions,
50+
"ubuntu2510": kops_versions,
51+
"ubuntu2510arm64": kops_versions,
52+
"amazonlinux2": kops_versions,
53+
"al2023": kops_versions,
54+
"al2023arm64": kops_versions,
55+
"rhel9": kops_versions,
56+
"rhel10arm64": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
57+
"rocky9": kops_versions,
58+
"rocky10arm64": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
59+
"flatcar": kops_versions,
60+
}
61+
62+
# GCE distributions
63+
gce_distro_options = {
64+
"cos121": kops_versions,
65+
"cos121arm64": kops_versions,
66+
"cos125": kops_versions,
67+
"cos125arm64": kops_versions,
68+
"cosdev": kops_versions,
69+
"cosdevarm64": kops_versions,
70+
"debian12": kops_versions,
71+
"debian12arm64": kops_versions,
72+
"debian13": kops_versions,
73+
"debian13arm64": kops_versions,
74+
"ubuntu2204": kops_versions,
75+
"ubuntu2404": kops_versions,
76+
"ubuntu2404arm64": kops_versions,
77+
"ubuntuminimal2404": kops_versions,
78+
"ubuntuminimal2404arm64": kops_versions,
79+
"rhel10": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
80+
"rocky10arm64": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
81+
"rocky10": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
82+
}
83+
84+
8185
# Network plugins for periodic network plugin tests
8286
network_plugins_periodics = {
8387
"plugins": [

‎config/jobs/kubernetes/kops/helpers.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,28 @@ def should_skip_newer_k8s(k8s_version, kops_version):
7474
return False
7575
if kops_version is None:
7676
return False
77+
if k8s_version == 'master':
78+
return False
7779
if k8s_version is None:
7880
return True
7981
return float(k8s_version) > float(kops_version)
8082

8183
def k8s_version_info(k8s_version):
8284
test_package_url = ''
8385
test_package_dir = ''
84-
if k8s_version == 'latest':
85-
marker = 'latest.txt'
86-
k8s_deploy_url = "https://dl.k8s.io/release/latest.txt"
87-
elif k8s_version == 'ci':
86+
if k8s_version == 'ci':
8887
marker = 'latest.txt'
89-
k8s_deploy_url = "https://storage.googleapis.com/k8s-release-dev/ci/latest.txt"
90-
test_package_url = 'https://storage.googleapis.com/k8s-release-dev'
88+
k8s_deploy_url = "https://dl.k8s.io/ci/latest.txt"
89+
test_package_url = 'https://dl.k8s.io'
9190
test_package_dir = 'ci'
9291
elif k8s_version == 'stable':
9392
marker = 'stable.txt'
9493
k8s_deploy_url = "https://dl.k8s.io/release/stable.txt"
9594
elif k8s_version:
96-
marker = f"stable-{k8s_version}.txt"
97-
k8s_deploy_url = f"https://dl.k8s.io/release/stable-{k8s_version}.txt" # pylint: disable=line-too-long
95+
marker = f"latest-{k8s_version}.txt"
96+
k8s_deploy_url = f"https://dl.k8s.io/ci/latest-{k8s_version}.txt" # pylint: disable=line-too-long
97+
test_package_url = 'https://dl.k8s.io'
98+
test_package_dir = 'ci'
9899
else:
99100
raise Exception('missing required k8s_version')
100101
return marker, k8s_deploy_url, test_package_url, test_package_dir

0 commit comments

Comments
 (0)