From 166a168b1864f712381da1f413d3401c4733e39c Mon Sep 17 00:00:00 2001 From: Ben Napolitan Date: Wed, 24 Jun 2020 09:21:17 -0400 Subject: [PATCH] Attempt all scale tests. --- scripts/lib/cluster.sh | 2 +- scripts/run-integration-tests.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/lib/cluster.sh b/scripts/lib/cluster.sh index af804e63d1..0434c4393d 100644 --- a/scripts/lib/cluster.sh +++ b/scripts/lib/cluster.sh @@ -14,7 +14,7 @@ function down-test-cluster() { function up-test-cluster() { MNGS="" if [[ "$RUN_SCALE_TESTS" == true ]]; then - MNGS='{"GetRef.Name-mng-for-cni":{"name":"GetRef.Name-mng-for-cni","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":3,"asg-max-size":3,"asg-desired-capacity":3,"instance-types":["c5.xlarge"],"volume-size":40}, "three-nodes":{"name":"three-nodes","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":3,"asg-max-size":3,"asg-desired-capacity":3,"instance-types":["m5.xlarge"],"volume-size":40}, "single-node":{"name":"single-node","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":1,"asg-max-size":1,"asg-desired-capacity":1,"instance-types":["m5.16xlarge"],"volume-size":40}, "multi-node":{"name":"multi-node","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":98,"asg-max-size":100,"asg-desired-capacity":98,"instance-types":["m5.xlarge"],"volume-size":40}}' + MNGS='{"three-nodes":{"name":"three-nodes","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":3,"asg-max-size":3,"asg-desired-capacity":3,"instance-types":["m5.xlarge"],"volume-size":40}, "single-node":{"name":"single-node","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":1,"asg-max-size":1,"asg-desired-capacity":1,"instance-types":["m5.16xlarge"],"volume-size":40}, "multi-node":{"name":"multi-node","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":98,"asg-max-size":100,"asg-desired-capacity":98,"instance-types":["m5.xlarge"],"volume-size":40}}' LARGE_SCALE=true RUN_CONFORMANCE=false else diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh index 72add69cc2..13a6862269 100755 --- a/scripts/run-integration-tests.sh +++ b/scripts/run-integration-tests.sh @@ -216,13 +216,13 @@ if [[ $TEST_PASS -eq 0 && "$RUN_CONFORMANCE" == true ]]; then fi if [[ "$RUN_SCALE_TESTS" == true ]]; then - # $KUBECTL_PATH apply -f deploy-130-pods.yaml - # run_scale_test_130_pods - # $KUBECTL_PATH delete -f deploy-130-pods.yaml + $KUBECTL_PATH apply -f deploy-130-pods.yaml + run_scale_test_130_pods + $KUBECTL_PATH delete -f deploy-130-pods.yaml - # $KUBECTL_PATH apply -f deploy-730-pods.yaml - # run_scale_test_730_pods - # $KUBECTL_PATH delete -f deploy-730-pods.yaml + $KUBECTL_PATH apply -f deploy-730-pods.yaml + run_scale_test_730_pods + $KUBECTL_PATH delete -f deploy-730-pods.yaml $KUBECTL_PATH apply -f deploy-5000-pods.yaml run_scale_test_5000_pods