Start mng with 1 node, put metadata into data file names, suppress co…

…py errors.
aws · Jul 1, 2020 · d9b58bb · d9b58bb
1 parent 5bab04d
commit d9b58bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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_PERFORMANCE_TESTS" == true ]]; then
-        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}}'
+        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":1,"asg-max-size":100,"asg-desired-capacity":1,"instance-types":["m5.xlarge"],"volume-size":40}}'
         RUN_CONFORMANCE=false
     else
         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}}'

diff --git a/scripts/lib/common.sh b/scripts/lib/common.sh
@@ -82,7 +82,7 @@ function run_performance_test_130_pods() {
     echo ""
     DEPLOY_DURATION=$((SECONDS - DEPLOY_START))
 
-    now="pod-130-scale-test-data-$(date +"%m-%d-%Y-%T").csv"
+    now="pod-130-Test#${TEST_ID}-$(date +"%m-%d-%Y-%T").csv"
     echo $now
 
     echo $(date +"%m-%d-%Y-%T") >> $now
@@ -91,7 +91,7 @@ function run_performance_test_130_pods() {
     echo $((SCALE_UP_DURATION_ARRAY[2])), $((SCALE_DOWN_DURATION_ARRAY[2])) >> $now
 
     cat $now
-    aws s3 cp $now s3://cni-scale-test-data
+    aws s3 cp $now s3://cni-performance-test-data --quiet
 
     echo "TIMELINE: 130 Pod performance test took $DEPLOY_DURATION seconds."
 }
@@ -145,7 +145,7 @@ function run_performance_test_730_pods() {
     echo ""
     DEPLOY_DURATION=$((SECONDS - DEPLOY_START))
 
-    now="pod-730-scale-test-data-$(date +"%m-%d-%Y-%T").csv"
+    now="pod-730-Test#${TEST_ID}-$(date +"%m-%d-%Y-%T").csv"
     echo $now
 
     echo $(date +"%m-%d-%Y-%T") >> $now
@@ -154,7 +154,7 @@ function run_performance_test_730_pods() {
     echo $((SCALE_UP_DURATION_ARRAY[2])), $((SCALE_DOWN_DURATION_ARRAY[2])) >> $now
 
     cat $now
-    aws s3 cp $now s3://cni-scale-test-data
+    aws s3 cp $now s3://cni-performance-test-data --quiet
 
     echo "TIMELINE: 730 Pod performance test took $DEPLOY_DURATION seconds."
 }
@@ -208,7 +208,7 @@ function run_performance_test_5000_pods() {
     echo ""
     DEPLOY_DURATION=$((SECONDS - DEPLOY_START))
 
-    now="pod-5000-scale-test-data-$(date +"%m-%d-%Y-%T").csv"
+    now="pod-5000-Test#${TEST_ID}-$(date +"%m-%d-%Y-%T").csv"
     echo $now
 
     echo $(date +"%m-%d-%Y-%T") >> $now
@@ -217,7 +217,7 @@ function run_performance_test_5000_pods() {
     echo $((SCALE_UP_DURATION_ARRAY[2])), $((SCALE_DOWN_DURATION_ARRAY[2])) >> $now
 
     cat $now
-    aws s3 cp $now s3://cni-scale-test-data
+    aws s3 cp $now s3://cni-performance-test-data --quiet
 
     echo "TIMELINE: 5000 Pod performance test took $DEPLOY_DURATION seconds."
 }