diff --git a/test/e2e/cruise/network/network_test.go b/test/e2e/cruise/network/network_test.go index d9ac8806a2..be920efb72 100644 --- a/test/e2e/cruise/network/network_test.go +++ b/test/e2e/cruise/network/network_test.go @@ -19,6 +19,7 @@ import ( "bufio" "context" "fmt" + "os" "os/exec" "strings" "testing" @@ -285,6 +286,15 @@ func overrideArgsEKS(args *networkTestsArgs) { } func overrideArgsGKE(args *networkTestsArgs) { + cni, ok := os.LookupEnv("CNI") + if !ok { + panic(fmt.Errorf("CNI environment variable not set")) + } + + if cni != "v1" && cni != "v2" { + panic(fmt.Errorf("CNI environment %q variable not valid", cni)) + } + args.failfast = false args.loadBalancer = true args.nodePortExt = true // nodeport are not exposed by default, modify GKE plugin to open nodeport firewall diff --git a/test/e2e/pipeline/infra/gke/const.sh b/test/e2e/pipeline/infra/gke/const.sh index 786d98c34b..df604b7338 100644 --- a/test/e2e/pipeline/infra/gke/const.sh +++ b/test/e2e/pipeline/infra/gke/const.sh @@ -13,8 +13,8 @@ export GKE_ZONES=( # General export GKE_NUM_NODES="2" -export GKE_MACHINE_TYPE="e2-standard-2" # "e2-micro", "e2-small", "e2-medium", "e2-standard-2", "e2-standard-4" -export GKE_DISK_TYPE="pd-balanced" -export GKE_DISK_SIZE="10" +export GKE_MACHINE_TYPE="e2-standard-4" # "e2-micro", "e2-small", "e2-medium", "e2-standard-2", "e2-standard-4" +export GKE_DISK_TYPE="pd-ssd" +export GKE_DISK_SIZE="50" ##################### \ No newline at end of file