From 82e7b2baa978d3fd562297dfa05c7b499fe14411 Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Tue, 14 May 2024 05:46:59 +0000 Subject: [PATCH] Ensure perf tool builds with sysroot and use Ubuntu nodes until COS issues are addressed Signed-off-by: Dom Del Nano --- src/e2e_test/perf_tool/pkg/cluster/gke/cluster_ops.go | 1 + src/e2e_test/perf_tool/pkg/suites/workloads.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/e2e_test/perf_tool/pkg/cluster/gke/cluster_ops.go b/src/e2e_test/perf_tool/pkg/cluster/gke/cluster_ops.go index 991c363127f..3ad7052f9e3 100644 --- a/src/e2e_test/perf_tool/pkg/cluster/gke/cluster_ops.go +++ b/src/e2e_test/perf_tool/pkg/cluster/gke/cluster_ops.go @@ -151,6 +151,7 @@ func (p *ClusterProvider) nodePoolForSpec(spec *experimentpb.ClusterSpec) *conta Name: nodePoolNameFromSpec(spec), Config: &containerpb.NodeConfig{ MachineType: spec.Node.MachineType, + ImageType: "ubuntu_containerd", DiskSizeGb: p.clusterOpts.DiskSizeGB, DiskType: p.clusterOpts.DiskType, OauthScopes: []string{ diff --git a/src/e2e_test/perf_tool/pkg/suites/workloads.go b/src/e2e_test/perf_tool/pkg/suites/workloads.go index 28e68ce119f..43e06ed78b4 100644 --- a/src/e2e_test/perf_tool/pkg/suites/workloads.go +++ b/src/e2e_test/perf_tool/pkg/suites/workloads.go @@ -65,7 +65,7 @@ func VizierWorkload() *pb.WorkloadSpec { Skaffold: &pb.SkaffoldDeploy{ SkaffoldPath: "skaffold/skaffold_vizier.yaml", SkaffoldArgs: []string{ - "-p", "opt", + "-p", "opt,x86_64_sysroot", }, }, },