fix kops job generator

Author: upodroid

config/jobs/kubernetes/kops/build_jobs.py

@@ -32,9 +32,9 @@
 from helpers import ( # pylint: disable=import-error, no-name-in-module
     build_cron,
     create_args,
-    distro_images,
+    aws_distro_images,
     gce_distro_images,
-    distros_ssh_user,
+    aws_distros_ssh_user,
     k8s_version_info,
     should_skip_newer_k8s,
     script_dir,
@@ -45,10 +45,9 @@
     image,
     networking_options,
     gce_distro_options,
-    distro_options,
+    aws_distro_options,
     k8s_versions,
     kops_versions,
-    distros,
     network_plugins_periodics,
     network_plugins_presubmits,
     upgrade_versions_list,
@@ -120,8 +119,8 @@ def build_test(cloud='aws',
         instance_groups_overrides = []
 
     if cloud == 'aws':
-        kops_image = distro_images[distro]
-        kops_ssh_user = distros_ssh_user[distro]
+        kops_image = aws_distro_images[distro]
+        kops_ssh_user = aws_distros_ssh_user[distro]
         kops_ssh_key_path = '/etc/aws-ssh/aws-ssh-private'
         if build_cluster is None:
             build_cluster = 'k8s-infra-kops-prow-build'
@@ -332,8 +331,8 @@ def presubmit_test(branch='master',
             kops_image = None
             kops_ssh_user = 'ubuntu'
         else:
-            kops_image = distro_images[distro]
-            kops_ssh_user = distros_ssh_user[distro]
+            kops_image = aws_distro_images[distro]
+            kops_ssh_user = aws_distros_ssh_user[distro]
         kops_ssh_key_path = '/etc/aws-ssh/aws-ssh-private'
         if build_cluster is None:
             build_cluster = 'k8s-infra-kops-prow-build'
@@ -477,15 +476,16 @@ def generate_grid():
     results = []
     # pylint: disable=too-many-nested-blocks
     for networking in networking_options:
-        for distro in distro_options:
+        for distro in aws_distro_options:
             for k8s_version in k8s_versions:
                 for kops_version in kops_versions:
+                    distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
                     extra_flags = []
                     if networking == 'cilium-eni':
                         extra_flags = ['--node-size=t3.large']
                     results.append(
                         build_test(cloud="aws",
-                                   distro=distro,
+                                   distro=distro_short,
                                    extra_dashboards=['kops-grid'],
                                    k8s_version=k8s_version,
                                    kops_version=kops_version,
@@ -497,10 +497,11 @@ def generate_grid():
     # Manually expand grid coverage for GCP
     # TODO(justinsb): merge into above block when we can
     # pylint: disable=too-many-nested-blocks
-    for networking in ['kubenet', 'calico', 'cilium', 'gce']: # TODO: all networking_options:
-        for distro in gce_distro_options: # TODO: all distro_options:
+    for networking in network_plugins_periodics['supports_gce']:
+        for distro in gce_distro_options:
             for k8s_version in k8s_versions:
-                for kops_version in [None]: # TODO: all kops_versions:
+                for kops_version in kops_versions:
+                    distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
                     extra_flags = ["--gce-service-account=default"] # Workaround for test-infra#24747
                     if 'arm64' in distro:
                         extra_flags.extend([
@@ -511,7 +512,7 @@ def generate_grid():
                     results.append(
                         build_test(cloud="gce",
                                    runs_per_day=3,
-                                   distro=distro,
+                                   distro=distro_short,
                                    extra_dashboards=['kops-grid'],
                                    k8s_version=k8s_version,
                                    kops_version=kops_version,
@@ -527,14 +528,6 @@ def generate_grid():
 #############################
 def generate_misc():
     results = [
-        # A one-off scenario testing the k8s.gcr.io mirror
-        build_test(name_override="kops-scenario-gcr-mirror",
-                   runs_per_day=24,
-                   cloud="aws",
-                   # Latest runs with a staging AWS CCM, not available in registry.k8s.io
-                   k8s_version='1.29',
-                   extra_dashboards=['kops-misc']),
-
         # A one-off scenario testing AWS EKS Pod Identity
         build_test(name_override="kops-aws-eks-pod-identity",
                    runs_per_day=3,
@@ -569,23 +562,6 @@ def generate_misc():
                    extra_flags=["--gce-service-account=default"],
                    extra_dashboards=['kops-network-plugins']),
 
-        # A special test for Calico CNI on Debian 11
-        build_test(name_override="kops-aws-cni-calico-deb11",
-                   cloud="aws",
-                   distro="deb11",
-                   k8s_version="stable",
-                   networking="calico",
-                   runs_per_day=3,
-                   extra_dashboards=['kops-network-plugins']),
-        # A special test for Calico CNI on Flatcar
-        build_test(name_override="kops-aws-cni-calico-flatcar",
-                   cloud="aws",
-                   distro="flatcararm64",
-                   k8s_version="stable",
-                   networking="calico",
-                   runs_per_day=3,
-                   extra_dashboards=['kops-distros', 'kops-network-plugins']),
-
         # A special test for IPv6 using Calico CNI
         build_test(name_override="kops-aws-cni-calico-ipv6",
                    cloud="aws",
@@ -728,57 +704,6 @@ def generate_misc():
                    ],
                    extra_dashboards=["kops-misc"]),
 
-        build_test(name_override="kops-aws-arm64-release",
-                   cloud="aws",
-                   k8s_version="latest",
-                   distro="u2404arm64",
-                   networking="calico",
-                   kops_channel="alpha",
-                   runs_per_day=3,
-                   extra_flags=["--zones=eu-central-1a",
-                                "--node-size=m6g.large",
-                                "--master-size=m6g.large"],
-                   extra_dashboards=["kops-misc"]),
-
-        build_test(name_override="kops-aws-arm64-ci",
-                   cloud="aws",
-                   k8s_version="ci",
-                   distro="u2404arm64",
-                   networking="calico",
-                   kops_channel="alpha",
-                   runs_per_day=3,
-                   extra_flags=["--zones=eu-central-1a",
-                                "--node-size=m6g.large",
-                                "--master-size=m6g.large"],
-                   extra_dashboards=["kops-misc"]),
-
-        build_test(name_override="kops-aws-arm64-conformance",
-                   cloud="aws",
-                   k8s_version="ci",
-                   distro="u2404arm64",
-                   networking="calico",
-                   kops_channel="alpha",
-                   runs_per_day=3,
-                   extra_flags=["--zones=eu-central-1a",
-                                "--node-size=m6g.large",
-                                "--master-size=m6g.large"],
-                   skip_regex=r'\[Slow\]|\[Serial\]|\[Flaky\]',
-                   focus_regex=r'\[Conformance\]|\[NodeConformance\]',
-                   extra_dashboards=["kops-misc"]),
-
-        build_test(name_override="kops-aws-amd64-conformance",
-                   cloud="aws",
-                   k8s_version="ci",
-                   distro='u2404',
-                   networking="calico",
-                   kops_channel="alpha",
-                   runs_per_day=3,
-                   extra_flags=["--node-size=c5.large",
-                                "--master-size=c5.large"],
-                   skip_regex=r'\[Slow\]|\[Serial\]|\[Flaky\]',
-                   focus_regex=r'\[Conformance\]|\[NodeConformance\]',
-                   extra_dashboards=["kops-misc"]),
-
         build_test(name_override="kops-aws-aws-load-balancer-controller",
                    cloud="aws",
                    networking="cilium",
@@ -1390,7 +1315,7 @@ def generate_conformance():
 ###############################
 def generate_distros():
     results = []
-    for distro in distros:
+    for distro in aws_distro_options:
         distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
         extra_flags = []
         if 'arm64' in distro:
@@ -1409,7 +1334,7 @@ def generate_distros():
                        networking='cilium',
                        k8s_version='stable',
                        kops_channel='alpha',
-                       name_override=f"kops-aws-distro-{distro}",
+                       name_override=f"kops-aws-distro-{distro_short}",
                        extra_dashboards=['kops-distros'],
                        extra_flags=extra_flags,
                        runs_per_day=3,
@@ -1422,7 +1347,7 @@ def generate_distros():
 ###############################
 def generate_presubmits_distros():
     results = []
-    for distro in distros:
+    for distro in aws_distro_options:
         distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
         extra_flags = []
         if 'arm64' in distro:
@@ -1782,21 +1707,23 @@ def generate_presubmits_scale():
 #################################
 def generate_nftables():
     results = []
-    for distro in distro_options:
+    for distro in aws_distro_options:
+        distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
         results.append(
             build_test(
                 cloud="aws",
-                distro=distro,
+                distro=distro_short,
                 k8s_version="stable",
                 networking="kindnet",
                 kops_channel="alpha",
-                name_override=f"kops-aws-nftables-{distro}",
+                name_override=f"kops-aws-nftables-{distro_short}",
                 extra_flags=["--set=cluster.spec.kubeProxy.proxyMode=nftables"],
                 extra_dashboards=["kops-nftables"],
                 runs_per_day=3,
             )
         )
     for distro in gce_distro_options:
+        distro_short = distro.replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
         extra_flags = [
             "--set=cluster.spec.kubeProxy.proxyMode=nftables",
             "--gce-service-account=default",
@@ -1810,11 +1737,11 @@ def generate_nftables():
         results.append(
             build_test(
                 cloud="gce",
-                distro=distro,
+                distro=distro_short,
                 k8s_version="stable",
                 networking="kindnet",
                 kops_channel="alpha",
-                name_override=f"kops-gce-nftables-{distro}",
+                name_override=f"kops-gce-nftables-{distro_short}",
                 extra_flags=extra_flags,
                 extra_dashboards=["kops-nftables"],
                 runs_per_day=3,
@@ -1837,11 +1764,11 @@ def generate_versions():
             runs_per_day=8,
         )
     ]
-    for version in ['1.34', '1.33', '1.32', '1.31']:
+    for version in ['1.34', '1.33', '1.32']:
         results.append(
             build_test(
                 cloud='aws',
-                k8s_version=version,
+                k8s_version=version.replace('master', 'ci'),
                 kops_channel='alpha',
                 name_override=f"kops-aws-k8s-{version.replace('.', '-')}",
                 networking='calico',
@@ -2335,25 +2262,6 @@ def generate_presubmits_e2e():
             tab_name='e2e-1-31',
             always_run=True,
         ),
-        presubmit_test(
-            branch='release-1.30',
-            k8s_version='1.30',
-            kops_channel='alpha',
-            name='pull-kops-e2e-k8s-aws-calico-1-30',
-            networking='calico',
-            tab_name='e2e-1-30',
-            always_run=True,
-        ),
-        presubmit_test(
-            branch='release-1.29',
-            k8s_version='1.29',
-            kops_channel='alpha',
-            name='pull-kops-e2e-k8s-aws-calico-1-29',
-            networking='calico',
-            tab_name='e2e-1-29',
-            always_run=True,
-        ),
-
         presubmit_test(
             name="pull-kops-scenario-aws-karpenter",
             cloud="aws",

config/jobs/kubernetes/kops/build_vars.py

@@ -26,6 +26,7 @@
     "cilium",
     "cilium-etcd",
     "cilium-eni",
+    "kindnet"
     "kopeio",
 ]
 
@@ -37,10 +38,10 @@
     "cos125arm64",
     "cosdev",
     "cosdevarm64",
-    "deb12",
-    "deb12arm64",
-    "deb13",
-    "deb13arm64",
+    "debian12",
+    "debian12arm64",
+    "debian13",
+    "debian13arm64",
     "u2204",
     "u2404",
     "u2404arm64",
@@ -49,33 +50,7 @@
 ]
 
 # AWS distributions
-distro_options = [
-    "al2023",
-    "deb12",
-    "deb13",
-    "flatcar",
-    "rhel8",
-    "u2204",
-    "u2404",
-]
-
-k8s_versions = [
-    "1.31",
-    "1.32",
-    "1.33",
-    "1.34",
-]
-
-# kOps versions tested
-kops_versions = [
-    None,  # maps to latest
-    "1.30",
-    "1.31",
-    "1.32",
-]
-
-# Distros for periodic and presubmit distro tests
-distros = [
+aws_distro_options = [
     "debian11",
     "debian12",
     "debian13",
@@ -94,6 +69,20 @@
     "flatcar",
 ]
 
+k8s_versions = [
+    "1.32",
+    "1.33",
+    "1.34",
+]
+
+# kOps versions tested
+kops_versions = [
+    None,  # maps to latest
+    "1.32",
+    "1.33",
+    "1.34",
+]
+
 # Network plugins for periodic network plugin tests
 network_plugins_periodics = {
     "plugins": [
@@ -107,7 +96,7 @@
         "kopeio",
         "kuberouter",
     ],
-    "supports_gce": {"calico", "cilium", "kindnet"},
+    "supports_gce": {"kubenet", "calico", "cilium", "kindnet", "gce"},
     "supports_azure": {"cilium"},
 }
 
@@ -133,6 +122,9 @@
 kops29 = "v1.29.2"
 kops30 = "v1.30.3"
 kops31 = "v1.31.0"
+kops32 = "v1.32.0"
+kops33 = "v1.33.0"
+kops34 = "v1.34.0"
 
 upgrade_versions_list = [
     #  kops    k8s          kops      k8s