Skip to content

Commit 6de66d9

Browse files
upodroidupodroid
committed
add 1.35 k8s/kops jobs and fix broken distro jobs
1 parent e257857 commit 6de66d9

14 files changed

+55892
-30990
lines changed

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

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
gce_distro_options,
4848
aws_distro_options,
4949
k8s_versions,
50-
kops_versions,
5150
network_plugins_periodics,
5251
network_plugins_presubmits,
5352
upgrade_versions_list,
@@ -484,8 +483,8 @@ def generate_grid():
484483
results = []
485484
# pylint: disable=too-many-nested-blocks
486485
for networking in network_plugins_periodics['supports_aws']:
487-
for distro in aws_distro_options:
488-
for k8s_version in k8s_versions:
486+
for distro, kops_versions in aws_distro_options.items():
487+
for k8s_version in [v for v in k8s_versions if v != 'master']:
489488
for kops_version in kops_versions:
490489
networking_arg = networking.replace('amazon-vpc', 'amazonvpc').replace('kuberouter', 'kube-router')
491490
distro_short = distro_shortener(distro)
@@ -510,8 +509,8 @@ def generate_grid():
510509
)
511510

512511
for networking in network_plugins_periodics['supports_gce']:
513-
for distro in gce_distro_options:
514-
for k8s_version in k8s_versions:
512+
for distro, kops_versions in gce_distro_options.items():
513+
for k8s_version in [v for v in k8s_versions if v != 'master']:
515514
for kops_version in kops_versions:
516515
distro_short = distro_shortener(distro)
517516
extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
@@ -1285,12 +1284,11 @@ def generate_misc():
12851284
################################
12861285
def generate_conformance():
12871286
results = []
1288-
for version in ['master', '1.34', '1.33', '1.32']:
1287+
for version in k8s_versions:
12891288
results.append(
12901289
build_test(
12911290
cloud='aws',
12921291
k8s_version=version.replace('master', 'ci'),
1293-
kops_version=version,
12941292
kops_channel='alpha',
12951293
name_override=f"kops-aws-conformance-{version.replace('.', '-')}",
12961294
networking='calico',
@@ -1310,7 +1308,6 @@ def generate_conformance():
13101308
build_test(
13111309
cloud='aws',
13121310
k8s_version=version.replace('master', 'ci'),
1313-
kops_version=version,
13141311
kops_channel='alpha',
13151312
name_override=f"kops-aws-conformance-arm64-{version.replace('.', '-')}",
13161313
networking='calico',
@@ -1333,7 +1330,7 @@ def generate_conformance():
13331330
###############################
13341331
def generate_distros():
13351332
results = []
1336-
for distro in aws_distro_options:
1333+
for distro, _ in aws_distro_options.items():
13371334
distro_short = distro_shortener(distro)
13381335
extra_flags = []
13391336
if 'arm64' in distro:
@@ -1365,7 +1362,7 @@ def generate_distros():
13651362
###############################
13661363
def generate_presubmits_distros():
13671364
results = []
1368-
for distro in aws_distro_options:
1365+
for distro, _ in aws_distro_options.items():
13691366
distro_short = distro_shortener(distro)
13701367
extra_flags = []
13711368
if 'arm64' in distro:
@@ -1391,7 +1388,7 @@ def generate_presubmits_distros():
13911388
always_run=False,
13921389
)
13931390
)
1394-
for distro in gce_distro_options:
1391+
for distro, _ in gce_distro_options.items():
13951392
distro_short = distro_shortener(distro)
13961393
extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
13971394
if 'arm64' in distro:
@@ -1755,7 +1752,7 @@ def generate_presubmits_scale():
17551752
#################################
17561753
def generate_nftables():
17571754
results = []
1758-
for distro in aws_distro_options:
1755+
for distro, _ in aws_distro_options.items():
17591756
distro_short = distro_shortener(distro)
17601757
extra_flags = ["--set=cluster.spec.kubeProxy.proxyMode=nftables"]
17611758
if 'arm64' in distro:
@@ -1777,7 +1774,7 @@ def generate_nftables():
17771774
runs_per_day=3,
17781775
)
17791776
)
1780-
for distro in gce_distro_options:
1777+
for distro, _ in gce_distro_options.items():
17811778
distro_short = distro_shortener(distro)
17821779
extra_flags = [
17831780
"--set=cluster.spec.kubeProxy.proxyMode=nftables",
@@ -1814,18 +1811,8 @@ def generate_nftables():
18141811
# kops-periodics-versions.yaml #
18151812
################################
18161813
def generate_versions():
1817-
results = [
1818-
build_test(
1819-
build_cluster='k8s-infra-kops-prow-build',
1820-
k8s_version='ci',
1821-
kops_channel='alpha',
1822-
name_override='kops-aws-k8s-latest',
1823-
networking='calico',
1824-
extra_dashboards=['kops-versions'],
1825-
runs_per_day=8,
1826-
)
1827-
]
1828-
for version in ['1.34', '1.33', '1.32']:
1814+
results = []
1815+
for version in k8s_versions:
18291816
results.append(
18301817
build_test(
18311818
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)