add 1.35 k8s/kops jobs and fix broken distro jobs

Author: upodroid

config/jobs/kubernetes/kops/build_jobs.py

@@ -48,7 +48,6 @@
     gce_distro_options,
     aws_distro_options,
     k8s_versions,
-    kops_versions,
     network_plugins_periodics,
     network_plugins_presubmits,
     upgrade_versions_list,
@@ -268,6 +267,8 @@ def build_test(cloud='aws',
     ]
     if cloud == 'gce':
         dashboards.extend(['kops-gce'])
+    if cloud == 'azure':
+        dashboards.extend(['kops-azure'])
 
     if extra_dashboards:
         dashboards.extend(extra_dashboards)
@@ -485,8 +486,8 @@ def generate_grid():
     results = []
     # pylint: disable=too-many-nested-blocks
     for networking in network_plugins_periodics['supports_aws']:
-        for distro in aws_distro_options:
-            for k8s_version in k8s_versions:
+        for distro, kops_versions in aws_distro_options.items():
+            for k8s_version in [v for v in k8s_versions if v != 'master']:
                 for kops_version in kops_versions:
                     networking_arg = networking.replace('amazon-vpc', 'amazonvpc').replace('kuberouter', 'kube-router')
                     distro_short = distro_shortener(distro)
@@ -511,8 +512,8 @@ def generate_grid():
                     )
 
     for networking in network_plugins_periodics['supports_gce']:
-        for distro in gce_distro_options:
-            for k8s_version in k8s_versions:
+        for distro, kops_versions in gce_distro_options.items():
+            for k8s_version in [v for v in k8s_versions if v != 'master']:
                 for kops_version in kops_versions:
                     distro_short = distro_shortener(distro)
                     extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
@@ -1286,12 +1287,11 @@ def generate_misc():
 ################################
 def generate_conformance():
     results = []
-    for version in ['master', '1.34', '1.33', '1.32']:
+    for version in k8s_versions:
         results.append(
             build_test(
                 cloud='aws',
                 k8s_version=version.replace('master', 'ci'),
-                kops_version=version,
                 kops_channel='alpha',
                 name_override=f"kops-aws-conformance-{version.replace('.', '-')}",
                 networking='calico',
@@ -1311,7 +1311,6 @@ def generate_conformance():
             build_test(
                 cloud='aws',
                 k8s_version=version.replace('master', 'ci'),
-                kops_version=version,
                 kops_channel='alpha',
                 name_override=f"kops-aws-conformance-arm64-{version.replace('.', '-')}",
                 networking='calico',
@@ -1352,7 +1351,7 @@ def generate_conformance():
 ###############################
 def generate_distros():
     results = []
-    for distro in aws_distro_options:
+    for distro, _ in aws_distro_options.items():
         distro_short = distro_shortener(distro)
         extra_flags = []
         if 'arm64' in distro:
@@ -1384,7 +1383,7 @@ def generate_distros():
 ###############################
 def generate_presubmits_distros():
     results = []
-    for distro in aws_distro_options:
+    for distro, _ in aws_distro_options.items():
         distro_short = distro_shortener(distro)
         extra_flags = []
         if 'arm64' in distro:
@@ -1410,7 +1409,7 @@ def generate_presubmits_distros():
                 always_run=False,
             )
         )
-    for distro in gce_distro_options:
+    for distro, _ in gce_distro_options.items():
         distro_short = distro_shortener(distro)
         extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
         if 'arm64' in distro:
@@ -1708,6 +1707,7 @@ def generate_presubmits_scale():
             networking='gce',
             cloud="gce",
             always_run=False,
+            run_if_changed=r'^tests\/e2e\/scenarios\/scalability\/run-test.sh',
             artifacts='$(ARTIFACTS)',
             test_timeout_minutes=450,
             env={
@@ -1774,7 +1774,7 @@ def generate_presubmits_scale():
 #################################
 def generate_nftables():
     results = []
-    for distro in aws_distro_options:
+    for distro, _ in aws_distro_options.items():
         distro_short = distro_shortener(distro)
         extra_flags = ["--set=cluster.spec.kubeProxy.proxyMode=nftables"]
         if 'arm64' in distro:
@@ -1796,7 +1796,7 @@ def generate_nftables():
                 runs_per_day=3,
             )
         )
-    for distro in gce_distro_options:
+    for distro, _ in gce_distro_options.items():
         distro_short = distro_shortener(distro)
         extra_flags = [
             "--set=cluster.spec.kubeProxy.proxyMode=nftables",
@@ -1833,18 +1833,8 @@ def generate_nftables():
 # kops-periodics-versions.yaml #
 ################################
 def generate_versions():
-    results = [
-        build_test(
-            build_cluster='k8s-infra-kops-prow-build',
-            k8s_version='ci',
-            kops_channel='alpha',
-            name_override='kops-aws-k8s-latest',
-            networking='calico',
-            extra_dashboards=['kops-versions'],
-            runs_per_day=8,
-        )
-    ]
-    for version in ['1.34', '1.33', '1.32']:
+    results = []
+    for version in k8s_versions:
         results.append(
             build_test(
                 cloud='aws',

config/jobs/kubernetes/kops/build_vars.py

@@ -19,55 +19,12 @@
 
 image = "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251209-13d7d11b0f-master"
 
-# GCE distributions
-gce_distro_options = [
-    "cos121",
-    "cos121arm64",
-    "cos125",
-    "cos125arm64",
-    "cosdev",
-    "cosdevarm64",
-    "debian12",
-    "debian12arm64",
-    "debian13",
-    "debian13arm64",
-    "ubuntu2204",
-    "ubuntu2404",
-    "ubuntu2404arm64",
-    "ubuntuminimal2404",
-    "ubuntuminimal2404arm64",
-    "rocky10",
-    # "rocky10arm64",
-    "rhel10",
-    # "rhel10arm64",
-    # "fedora43", #https://bugzilla.redhat.com/show_bug.cgi?id=2394063
-]
-
-# AWS distributions
-aws_distro_options = [
-    "debian11",
-    "debian12",
-    "debian13",
-    "ubuntu2204",
-    "ubuntu2204arm64",
-    "ubuntu2404",
-    "ubuntu2404arm64",
-    "ubuntu2510",
-    "ubuntu2510arm64",
-    "amazonlinux2",
-    "al2023",
-    "al2023arm64",
-    "rhel9",
-    "rhel10arm64",
-    "rocky9",
-    "rocky10arm64",
-    "flatcar",
-]
-
 k8s_versions = [
+    "master",
     "1.32",
     "1.33",
     "1.34",
+    "1.35",
 ]
 
 # kOps versions tested
@@ -78,6 +35,53 @@
     "1.34",
 ]
 
+def drop_unsupported_versions(original_list, version_to_drop):
+    return list(filter(lambda item: item not in version_to_drop, original_list))
+
+# AWS distributions
+aws_distro_options = {
+    "debian11": kops_versions,
+    "debian12": kops_versions,
+    "debian13": kops_versions,
+    "ubuntu2204": kops_versions,
+    "ubuntu2204arm64": kops_versions,
+    "ubuntu2404": kops_versions,
+    "ubuntu2404arm64": kops_versions,
+    "ubuntu2510": kops_versions,
+    "ubuntu2510arm64": kops_versions,
+    "amazonlinux2": kops_versions,
+    "al2023": kops_versions,
+    "al2023arm64": kops_versions,
+    "rhel9": kops_versions,
+    "rhel10arm64": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
+    "rocky9": kops_versions,
+    "rocky10arm64": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
+    "flatcar": kops_versions,
+}
+
+# GCE distributions
+gce_distro_options = {
+    "cos121": kops_versions,
+    "cos121arm64": kops_versions,
+    "cos125": kops_versions,
+    "cos125arm64": kops_versions,
+    "cosdev": kops_versions,
+    "cosdevarm64": kops_versions,
+    "debian12": kops_versions,
+    "debian12arm64": kops_versions,
+    "debian13": kops_versions,
+    "debian13arm64": kops_versions,
+    "ubuntu2204": kops_versions,
+    "ubuntu2404": kops_versions,
+    "ubuntu2404arm64": kops_versions,
+    "ubuntuminimal2404": kops_versions,
+    "ubuntuminimal2404arm64": kops_versions,
+    "rhel10": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
+    "rocky10arm64": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
+    "rocky10": drop_unsupported_versions(kops_versions, ['1.32, 1.33']),
+}
+
+
 # Network plugins for periodic network plugin tests
 network_plugins_periodics = {
     "plugins": [

config/jobs/kubernetes/kops/helpers.py

@@ -74,27 +74,28 @@ def should_skip_newer_k8s(k8s_version, kops_version):
         return False
     if kops_version is None:
         return False
+    if k8s_version == 'master':
+        return False
     if k8s_version is None:
         return True
     return float(k8s_version) > float(kops_version)
 
 def k8s_version_info(k8s_version):
     test_package_url = ''
     test_package_dir = ''
-    if k8s_version == 'latest':
-        marker = 'latest.txt'
-        k8s_deploy_url = "https://dl.k8s.io/release/latest.txt"
-    elif k8s_version == 'ci':
+    if k8s_version == 'ci':
         marker = 'latest.txt'
-        k8s_deploy_url = "https://storage.googleapis.com/k8s-release-dev/ci/latest.txt"
-        test_package_url = 'https://storage.googleapis.com/k8s-release-dev'
+        k8s_deploy_url = "https://dl.k8s.io/ci/latest.txt"
+        test_package_url = 'https://dl.k8s.io'
         test_package_dir = 'ci'
     elif k8s_version == 'stable':
         marker = 'stable.txt'
         k8s_deploy_url = "https://dl.k8s.io/release/stable.txt"
     elif k8s_version:
-        marker = f"stable-{k8s_version}.txt"
-        k8s_deploy_url = f"https://dl.k8s.io/release/stable-{k8s_version}.txt" # pylint: disable=line-too-long
+        marker = f"latest-{k8s_version}.txt"
+        k8s_deploy_url = f"https://dl.k8s.io/ci/latest-{k8s_version}.txt" # pylint: disable=line-too-long
+        test_package_url = 'https://dl.k8s.io'
+        test_package_dir = 'ci'
     else:
         raise Exception('missing required k8s_version')
     return marker, k8s_deploy_url, test_package_url, test_package_dir