fix kops job generator

Author: upodroid

config/jobs/kubernetes/kops/build_jobs.py

@@ -19,16 +19,6 @@
 
 image = "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master"
 
-# Grid Definitions
-networking_options = [
-    "kubenet",
-    "calico",
-    "cilium",
-    "cilium-etcd",
-    "cilium-eni",
-    "kopeio",
-]
-
 # GCE distributions
 gce_distro_options = [
     "cos121",
@@ -37,45 +27,21 @@
     "cos125arm64",
     "cosdev",
     "cosdevarm64",
-    "deb12",
-    "deb12arm64",
-    "deb13",
-    "deb13arm64",
-    "u2204",
-    "u2404",
-    "u2404arm64",
-    "umini2404",
-    "umini2404arm64",
+    "debian12",
+    "debian12arm64",
+    "debian13",
+    "debian13arm64",
+    "ubuntu2204",
+    "ubuntu2404",
+    "ubuntu2404arm64",
+    "ubuntuminimal2404",
+    "ubuntuminimal2404arm64",
+    "rocky10",
+    "rocky10arm64",
 ]
 
 # 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,21 +60,49 @@
     "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": [
         "amazon-vpc",
         "calico",
+        "gce",
         "cilium",
         "cilium-etcd",
         "cilium-eni",
         "flannel",
         "kindnet",
         "kopeio",
+        "kubenet",
         "kuberouter",
     ],
-    "supports_gce": {"calico", "cilium", "kindnet"},
-    "supports_azure": {"cilium"},
+    "supports_aws": [
+        "amazon-vpc",
+        "calico",
+        "cilium",
+        "cilium-etcd",
+        "cilium-eni",
+        "flannel",
+        "kindnet",
+        "kopeio",
+        "kubenet",
+        "kuberouter",
+    ],
+    "supports_gce": ["kubenet", "calico", "cilium", "kindnet", "gce"],
+    "supports_azure": ["cilium"],
 }
 
 # Network plugins for presubmit network plugin tests
@@ -133,6 +127,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

config/jobs/kubernetes/kops/build_vars.py

@@ -112,6 +112,9 @@ def create_args(kops_channel, networking, extra_flags, kops_image):
         args = f"--image='{kops_image}' {args}"
     return args.strip()
 
+def distro_shortener(distro):
+    return distro.replace('ubuntuminimal', 'umini').replace('ubuntu', 'u').replace('debian', 'deb').replace('amazonlinux', 'amzn')
+
 # The pin file contains a list of key=value pairs, that holds images we want to pin.
 # This enables us to use the latest image without fetching them from AWS every time.
 def pinned_file():
@@ -222,9 +225,11 @@ def latest_gce_image(project, family, arch="X86_64"):
     "cos125arm64": latest_gce_image("cos-cloud", "cos-arm64-125-lts", "ARM64"),
     "cosdev": latest_gce_image("cos-cloud", "cos-dev"),
     "cosdevarm64": latest_gce_image("cos-cloud", "cos-arm64-dev", "ARM64"),
+    "rocky10": latest_gce_image("rocky-linux-cloud", "rocky-linux-10-optimized-gcp"),
+    "rocky10arm64": latest_gce_image("rocky-linux-cloud", "rocky-linux-10-optimized-gcp-arm64", "ARM64"),
 }
 
-distro_images = {
+aws_distro_images = {
     'al2023': latest_aws_image('137112412989', 'al2023-ami-2*-kernel-6.12-x86_64'),
     'al2023arm64': latest_aws_image('137112412989', 'al2023-ami-2*-kernel-6.12-arm64', 'arm64'),
     'amzn2': latest_aws_image('137112412989', 'amzn2-ami-kernel-5.10-hvm-*-x86_64-gp2'),
@@ -245,7 +250,7 @@ def latest_gce_image(project, family, arch="X86_64"):
     'u2510arm64': latest_aws_image('099720109477', 'ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-arm64-server-*', 'arm64'), # pylint: disable=line-too-long
 }
 
-distros_ssh_user = {
+aws_distros_ssh_user = {
     'al2023': 'ec2-user',
     'al2023arm64': 'ec2-user',
     'amzn2': 'ec2-user',

config/jobs/kubernetes/kops/helpers.py

@@ -3,8 +3,8 @@
 periodics:
 
 # {"cloud": "aws", "distro": "deb11", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-debian11
-  cron: '42 7-23/8 * * *'
+- name: e2e-kops-aws-distro-deb11
+  cron: '11 4-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -64,11 +64,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-deb11, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-debian11
+    testgrid-tab-name: kops-aws-distro-deb11
 
 # {"cloud": "aws", "distro": "deb12", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-debian12
-  cron: '8 5-23/8 * * *'
+- name: e2e-kops-aws-distro-deb12
+  cron: '21 6-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -127,11 +127,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-deb12, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-debian12
+    testgrid-tab-name: kops-aws-distro-deb12
 
 # {"cloud": "aws", "distro": "deb13", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-debian13
-  cron: '6 3-23/8 * * *'
+- name: e2e-kops-aws-distro-deb13
+  cron: '39 0-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -190,11 +190,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-deb13, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-debian13
+    testgrid-tab-name: kops-aws-distro-deb13
 
 # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-ubuntu2204
-  cron: '34 4-23/8 * * *'
+- name: e2e-kops-aws-distro-u2204
+  cron: '28 3-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -253,11 +253,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-u2204, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-ubuntu2204
+    testgrid-tab-name: kops-aws-distro-u2204
 
 # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-ubuntu2204arm64
-  cron: '36 3-23/8 * * *'
+- name: e2e-kops-aws-distro-u2204arm64
+  cron: '22 4-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -317,11 +317,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-u2204, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-ubuntu2204arm64
+    testgrid-tab-name: kops-aws-distro-u2204arm64
 
 # {"cloud": "aws", "distro": "u2404", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-ubuntu2404
-  cron: '28 6-23/8 * * *'
+- name: e2e-kops-aws-distro-u2404
+  cron: '46 1-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -380,11 +380,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-u2404, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-ubuntu2404
+    testgrid-tab-name: kops-aws-distro-u2404
 
 # {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-ubuntu2404arm64
-  cron: '59 4-23/8 * * *'
+- name: e2e-kops-aws-distro-u2404arm64
+  cron: '41 3-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -444,11 +444,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-u2404, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-ubuntu2404arm64
+    testgrid-tab-name: kops-aws-distro-u2404arm64
 
 # {"cloud": "aws", "distro": "u2510", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-ubuntu2510
-  cron: '23 1-23/8 * * *'
+- name: e2e-kops-aws-distro-u2510
+  cron: '21 6-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -507,11 +507,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-u2510, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-ubuntu2510
+    testgrid-tab-name: kops-aws-distro-u2510
 
 # {"cloud": "aws", "distro": "u2510arm64", "extra_flags": "--zones=eu-west-1a --node-size=m6g.large --master-size=m6g.large", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-ubuntu2510arm64
-  cron: '31 0-23/8 * * *'
+- name: e2e-kops-aws-distro-u2510arm64
+  cron: '5 7-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -571,11 +571,11 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-u2510, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-ubuntu2510arm64
+    testgrid-tab-name: kops-aws-distro-u2510arm64
 
 # {"cloud": "aws", "distro": "amzn2", "extra_flags": "--set=cluster.spec.containerd.version=1.7.28 --set=cluster.spec.containerd.runc.version=1.3.0", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
-- name: e2e-kops-aws-distro-amazonlinux2
-  cron: '59 1-23/8 * * *'
+- name: e2e-kops-aws-distro-amzn2
+  cron: '53 2-23/8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -635,7 +635,7 @@ periodics:
     test.kops.k8s.io/networking: cilium
     testgrid-dashboards: kops-distro-amzn2, kops-distros, kops-k8s-stable, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-aws-distro-amazonlinux2
+    testgrid-tab-name: kops-aws-distro-amzn2
 
 # {"cloud": "aws", "distro": "al2023", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
 - name: e2e-kops-aws-distro-al2023