Merge pull request kubernetes#27910 from johngmyers/containerd

kops: suppress containerd suffix in test names
akhilerm · Nov 7, 2022 · 8a033d1 · 8a033d1
2 parents 94e2d7a + d7c1645
commit 8a033d1
Show file tree

Hide file tree

Showing 2 changed files with 988 additions and 988 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -109,7 +109,7 @@ def build_test(cloud='aws',
         suffix += "-k" + k8s_version.replace("1.", "")
     if kops_version:
         suffix += "-ko" + kops_version.replace("1.", "")
-    if container_runtime:
+    if container_runtime and container_runtime != "containerd":
         suffix += "-" + container_runtime
 
     tab = name_override or (f"kops-grid{suffix}")