Remove kops tests for unsupported distros

kubernetes · Dec 4, 2021 · 3091d2c · 3091d2c
1 parent 5b1df26
commit 3091d2c
Show file tree

Hide file tree

Showing 2 changed files with 4,449 additions and 12,042 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -353,12 +353,9 @@ def presubmit_test(branch='master',
 
 distro_options = [
     'amzn2',
-    'deb9',
     'deb10',
     'flatcar',
-    'rhel7',
     'rhel8',
-    'u1804',
     'u2004',
 ]
 
@@ -391,9 +388,6 @@ def generate_grid():
             for distro in distro_options:
                 for k8s_version in k8s_versions:
                     for kops_version in kops_versions:
-                        # https://github.com/kubernetes/kops/pull/11696
-                        if kops_version is None and distro in ["deb9", "rhel7", "u1804"]:
-                            continue
                         results.append(
                             build_test(cloud="aws",
                                        distro=distro,
@@ -413,9 +407,6 @@ def generate_grid():
             for distro in ['u2004']: # TODO: all distro_options:
                 for k8s_version in ["1.22"]: # TODO: all k8s_versions:
                     for kops_version in [None]: # TODO: all kops_versions:
-                        # https://github.com/kubernetes/kops/pull/11696
-                        if kops_version is None and distro in ["deb9", "rhel7", "u1804"]:
-                            continue
                         results.append(
                             build_test(cloud="gce",
                                        distro=distro,
@@ -792,7 +783,7 @@ def generate_versions():
         )
     ]
     for version in ['1.22', '1.21', '1.20', '1.19', '1.18']:
-        distro = 'deb9' if version == '1.17' else 'u2004'
+        distro = 'u2004'
         results.append(
             build_test(
                 distro=distro,