Remove jobs no longer used and also update tooling

config/jobs/kubernetes/generated/generated.yaml

@@ -26,7 +26,7 @@ periodics:
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
       - --runtime-config=api/all=true
-      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|SidecarContainers|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
+      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
       env:
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
       resources:
@@ -78,42 +78,6 @@ periodics:
   annotations:
     testgrid-tab-name: gce-cos-k8sbeta-default
     testgrid-dashboards: sig-release-1.34-blocking
-- tags:
-  - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
-  interval: 1h
-  labels:
-    preset-service-account: 'true'
-    preset-k8s-ssh: 'true'
-  decorate: true
-  decoration_config:
-    timeout: 170m
-  name: ci-kubernetes-e2e-gce-cos-k8sbeta-ingress
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      - /workspace/scenarios/kubernetes_e2e.py
-      args:
-      - --check-leaked-resources
-      - --provider=gce
-      - --gcp-region=us-central1
-      - --gcp-node-image=gci
-      - --extract=ci/latest-1.34
-      - --timeout=150m
-      - --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
-      env:
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 3Gi
-        limits:
-          cpu: 1000m
-          memory: 3Gi
-  cluster: k8s-infra-prow-build
-  annotations:
-    testgrid-tab-name: gce-cos-k8sbeta-ingress
-    testgrid-dashboards: sig-release-1.34-blocking
 - tags:
   - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
   interval: 1h
@@ -253,7 +217,7 @@ periodics:
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
       - --runtime-config=api/all=true
-      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|SidecarContainers|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
+      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
       env:
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
       resources:
@@ -299,42 +263,6 @@ periodics:
   annotations:
     testgrid-tab-name: gce-cos-k8sstable1-default
     testgrid-dashboards: sig-release-1.33-blocking
-- tags:
-  - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
-  interval: 2h
-  labels:
-    preset-service-account: 'true'
-    preset-k8s-ssh: 'true'
-  decorate: true
-  decoration_config:
-    timeout: 170m
-  name: ci-kubernetes-e2e-gce-cos-k8sstable1-ingress
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      - /workspace/scenarios/kubernetes_e2e.py
-      args:
-      - --check-leaked-resources
-      - --provider=gce
-      - --gcp-region=us-central1
-      - --gcp-node-image=gci
-      - --extract=ci/latest-1.33
-      - --timeout=150m
-      - --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
-      env:
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 3Gi
-        limits:
-          cpu: 1000m
-          memory: 3Gi
-  cluster: k8s-infra-prow-build
-  annotations:
-    testgrid-tab-name: gce-cos-k8sstable1-ingress
-    testgrid-dashboards: sig-release-1.33-blocking
 - tags:
   - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
   interval: 2h
@@ -468,7 +396,7 @@ periodics:
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
       - --runtime-config=api/all=true
-      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|SidecarContainers|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
+      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
       env:
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
       resources:
@@ -514,42 +442,6 @@ periodics:
   annotations:
     testgrid-tab-name: gce-cos-k8sstable2-default
     testgrid-dashboards: sig-release-1.32-blocking
-- tags:
-  - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
-  interval: 6h
-  labels:
-    preset-service-account: 'true'
-    preset-k8s-ssh: 'true'
-  decorate: true
-  decoration_config:
-    timeout: 170m
-  name: ci-kubernetes-e2e-gce-cos-k8sstable2-ingress
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      - /workspace/scenarios/kubernetes_e2e.py
-      args:
-      - --check-leaked-resources
-      - --provider=gce
-      - --gcp-region=us-central1
-      - --gcp-node-image=gci
-      - --extract=ci/latest-1.32
-      - --timeout=150m
-      - --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
-      env:
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 3Gi
-        limits:
-          cpu: 1000m
-          memory: 3Gi
-  cluster: k8s-infra-prow-build
-  annotations:
-    testgrid-tab-name: gce-cos-k8sstable2-ingress
-    testgrid-dashboards: sig-release-1.32-blocking
 - tags:
   - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
   interval: 6h
@@ -683,7 +575,7 @@ periodics:
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
       - --runtime-config=api/all=true
-      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|SidecarContainers|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
+      - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0 --minStartupPods=8
       env:
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
       resources:
@@ -730,42 +622,6 @@ periodics:
     testgrid-tab-name: gce-cos-k8sstable3-default
     testgrid-dashboards: sig-release-1.31-blocking
     testgrid-num-failures-to-alert: '6'
-- tags:
-  - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
-  interval: 24h
-  labels:
-    preset-service-account: 'true'
-    preset-k8s-ssh: 'true'
-  decorate: true
-  decoration_config:
-    timeout: 170m
-  name: ci-kubernetes-e2e-gce-cos-k8sstable3-ingress
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      - /workspace/scenarios/kubernetes_e2e.py
-      args:
-      - --check-leaked-resources
-      - --provider=gce
-      - --gcp-region=us-central1
-      - --gcp-node-image=gci
-      - --extract=ci/latest-1.31
-      - --timeout=150m
-      - --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
-      env:
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251029-79c2132152-master
-      resources:
-        requests:
-          cpu: 1000m
-          memory: 3Gi
-        limits:
-          cpu: 1000m
-          memory: 3Gi
-  cluster: k8s-infra-prow-build
-  annotations:
-    testgrid-tab-name: gce-cos-k8sstable3-ingress
-    testgrid-dashboards: sig-release-1.31-blocking
 - tags:
   - generated   # AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT!
   interval: 24h

config/jobs/kubernetes/kops/build_jobs.py

@@ -119,6 +119,10 @@ def build_test(cloud='aws',
     if instance_groups_overrides is None:
         instance_groups_overrides = []
 
+    kops_image = None
+    kops_ssh_user = None
+    kops_ssh_key_path = None
+
     if cloud == 'aws':
         kops_image = distro_images[distro]
         kops_ssh_user = distros_ssh_user[distro]
@@ -327,6 +331,10 @@ def presubmit_test(branch='master',
                    alert_num_failures=None,
                    instance_groups_overrides=None):
     # pylint: disable=too-many-statements,too-many-branches,too-many-arguments
+    kops_image = None
+    kops_ssh_user = None
+    kops_ssh_key_path = None
+
     if cloud == 'aws':
         if distro == "channels":
             kops_image = None

config/testgrids/generated-test-config.yaml

@@ -15,13 +15,6 @@ test_groups:
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
-- name: ci-kubernetes-e2e-gce-cos-k8sbeta-ingress
-  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-ingress
-  column_header:
-  - configuration_value: node_os_image
-  - configuration_value: master_os_image
-  - configuration_value: Commit
-  - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sbeta-reboot
   gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-reboot
   column_header:
@@ -57,13 +50,6 @@ test_groups:
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
-- name: ci-kubernetes-e2e-gce-cos-k8sstable1-ingress
-  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-ingress
-  column_header:
-  - configuration_value: node_os_image
-  - configuration_value: master_os_image
-  - configuration_value: Commit
-  - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable1-reboot
   gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-reboot
   column_header:
@@ -99,13 +85,6 @@ test_groups:
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
-- name: ci-kubernetes-e2e-gce-cos-k8sstable2-ingress
-  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-ingress
-  column_header:
-  - configuration_value: node_os_image
-  - configuration_value: master_os_image
-  - configuration_value: Commit
-  - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable2-reboot
   gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-reboot
   column_header:
@@ -141,13 +120,6 @@ test_groups:
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
-- name: ci-kubernetes-e2e-gce-cos-k8sstable3-ingress
-  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-ingress
-  column_header:
-  - configuration_value: node_os_image
-  - configuration_value: master_os_image
-  - configuration_value: Commit
-  - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-reboot
   gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-reboot
   column_header:

config/testgrids/kubernetes/sig-network/config.yaml

@@ -22,24 +22,6 @@ dashboards:
 - name: sig-network-external-dns
 - name: sig-network-gce
   dashboard_tab:
-    - name: gce-cos-1.11-ingress
-      test_group_name: ci-kubernetes-e2e-gce-cos-k8sstable3-ingress
-      alert_options:
-        alert_mail_to_addresses: [email protected]
-    - name: gce-cos-1.12-ingress
-      test_group_name: ci-kubernetes-e2e-gce-cos-k8sstable2-ingress
-      alert_options:
-        alert_mail_to_addresses: [email protected]
-    - name: gce-cos-1.13-ingress
-      test_group_name: ci-kubernetes-e2e-gce-cos-k8sstable1-ingress
-      alert_options:
-        alert_mail_to_addresses: [email protected]
-    # TODO(1.30): Uncomment this when adding jobs for release-1.30 branch.
-    # TODO(1.29): comment this out when we move 1.29 to stable1
-    - name: gce-cos-1.14-ingress
-      test_group_name: ci-kubernetes-e2e-gce-cos-k8sbeta-ingress
-      alert_options:
-        alert_mail_to_addresses: [email protected]
     - name: gci-gce-ipvs
       test_group_name: ci-kubernetes-e2e-gci-gce-ipvs
       description: network gci-gce e2e tests in ipvs proxier mode

hack/make-rules/py-test/activate-python_venv.sh

@@ -24,7 +24,12 @@ cd "${REPO_ROOT}"
 # Trick from https://pythonspeed.com/articles/activate-virtualenv-dockerfile/
 export VIRTUAL_ENV="${REPO_ROOT}/.python_virtual_env"
 
-if [[ ! -f "${VIRTUAL_ENV}/bin/activate" ]]; then
+# Check if the virtual environment exists and matches the current python version
+CURRENT_PYTHON_VERSION=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+VENV_PYTHON_VERSION_DIR="${VIRTUAL_ENV}/lib/python${CURRENT_PYTHON_VERSION}"
+
+if [[ ! -d "${VENV_PYTHON_VERSION_DIR}" || ! -f "${VIRTUAL_ENV}/bin/activate" ]]; then
+    rm -rf "${VIRTUAL_ENV}"
     python3 -m venv "${VIRTUAL_ENV}"
 fi
 

hack/run-in-python-container.sh

@@ -24,10 +24,10 @@ cd "${REPO_ROOT}"
 
 # Use ARM version of Python image when on ARM architecture
 if [[ "$(uname -m)" == "arm64" ]]; then
-  PY_IMAGE='python:3.9-slim-buster'
+  PY_IMAGE='python:3.14-slim-trixie'
   PLATFORM_FLAG="--platform=linux/arm64"
 else
-  PY_IMAGE='python:3.9-slim-buster'
+  PY_IMAGE='python:3.14-slim-trixie'
   PLATFORM_FLAG=""
 fi
 

kettle/make_json.py

@@ -28,7 +28,7 @@
 try:
     import defusedxml.ElementTree as ET
 except ImportError:
-    import xml.etree.cElementTree as ET
+    import xml.etree.ElementTree as ET
 
 import model
 

kettle/make_json_test.py

@@ -588,7 +588,7 @@ def expect(args, needles, negneedles, expected_ret=None):
             for needle in negneedles:
                 # Only match negative needles in the middle of a word, to avoid
                 # failures on timestamps that happen to contain a short number.
-                self.assertNotRegexpMatches(result, r'\b%s\b' % needle) # pylint: disable=deprecated-method
+                self.assertNotRegex(result, r'\b%s\b' % needle) # pylint: disable=deprecated-method
 
         add_build('some-job/123', last_month, last_month + 10, 'SUCCESS', junits)
         add_build('some-job/456', now - 10, now, 'FAILURE', junits)

metrics/bigquery.py

@@ -19,7 +19,7 @@
 import argparse
 import glob
 import os
-import pipes
+import shlex
 import re
 import subprocess
 import sys
@@ -34,7 +34,7 @@
 
 def check(cmd, **kwargs):
     """Logs and runs the command, raising on errors."""
-    print('Run:', ' '.join(pipes.quote(c) for c in cmd), end=' ', file=sys.stderr)
+    print('Run:', ' '.join(shlex.quote(c) for c in cmd), end=' ', file=sys.stderr)
     if hasattr(kwargs.get('stdout'), 'name'):
         print(' > %s' % kwargs['stdout'].name, file=sys.stderr)
     else:

pylintrc

@@ -1,5 +1,5 @@
 [MESSAGES CONTROL]
-disable=fixme,locally-disabled,locally-enabled,relative-import,too-few-public-methods,missing-docstring,ungrouped-imports,too-many-lines,too-many-locals,invalid-name,superfluous-parens
+disable=fixme,locally-disabled,locally-enabled,relative-import,too-few-public-methods,missing-docstring,ungrouped-imports,too-many-lines,too-many-locals,invalid-name,superfluous-parens,consider-using-f-string,unspecified-encoding,consider-using-with,missing-timeout,consider-using-from-import,too-many-positional-arguments,unnecessary-lambda-assignment,use-dict-literal,broad-exception-raised,consider-using-enumerate,consider-using-in,inconsistent-return-statements,no-else-raise,f-string-without-interpolation,format-string-without-interpolation,consider-iterating-dictionary,useless-option-value,consider-using-max-builtin
 
 [REPORTS]
 reports=no

releng/generate_tests.py

@@ -415,7 +415,8 @@ def main(yaml_config_path, output_dir, testgrid_output_path):
 if __name__ == '__main__':
     PARSER = argparse.ArgumentParser(
         description='Create test definitions from the given yaml config')
-    PARSER.add_argument('--yaml-config-path', help='Path to config.yaml')
+    PARSER.add_argument('--yaml-config-path', help='Path to config.yaml',
+                        default='releng/test_config.yaml')
     PARSER.add_argument(
         '--output-dir',
         help='Prowjob config output dir',