From 8f8eddd2776cb392e655bce7bc2eef2da6ed5113 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Thu, 30 Nov 2023 17:40:25 -0600 Subject: [PATCH] WIP pin presubmit cilium-eni job to 20.04 --- tests/e2e/kubetest2-kops/deployer/up.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go index bc824b1b89cbc..c4994e1e57df7 100644 --- a/tests/e2e/kubetest2-kops/deployer/up.go +++ b/tests/e2e/kubetest2-kops/deployer/up.go @@ -154,6 +154,18 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e if err != nil { return err } + + if strings.Contains(d.CreateArgs, "cilium-eni") { + for i, arg := range createArgs { + if strings.Contains(arg, "ubuntu-jammy-22.04-arm64") { + createArgs[i] = "--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231127'" + } + if strings.Contains(arg, "t4g.large") { + createArgs[i] = strings.ReplaceAll(arg, "t4g.large", "t3.large") + } + } + } + args = append(args, createArgs...) } args = appendIfUnset(args, "--admin-access", adminAccess) @@ -216,6 +228,7 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e args = appendIfUnset(args, "--kubernetes-feature-gates", d.KubernetesFeatureGates) } + klog.Infof("Command: %v", args) cmd := exec.Command(args[0], args[1:]...) cmd.SetEnv(d.env()...)