Fix indentation in config files, set defaults for longer term runs

(opt-tsan-asan.json) and short term test runs (opt.json)

3 files changed, 193 insertions, 195 deletions

diff --git a/tools/run_tests/stress_test/configs/opt-tsan-asan.json b/tools/run_tests/stress_test/configs/opt-tsan-asan.json
index 6d4f74f816..1dc2d3fe08 100644
--- a/tools/run_tests/stress_test/configs/opt-tsan-asan.json
+++ b/tools/run_tests/stress_test/configs/opt-tsan-asan.json
@@ -1,136 +1,135 @@
 {
-    "dockerImages": {
-        "grpc_stress_cxx_opt" : {
-            "buildScript": "tools/jenkins/build_interop_stress_image.sh",
-            "dockerFileDir": "grpc_interop_stress_cxx",
-            "buildType": "opt"
-        },
-        "grpc_stress_cxx_tsan": {
-            "buildScript": "tools/jenkins/build_interop_stress_image.sh",
-            "dockerFileDir": "grpc_interop_stress_cxx",
-            "buildType": "tsan"
-        },
-        "grpc_stress_cxx_asan": {
-            "buildScript": "tools/jenkins/build_interop_stress_image.sh",
-            "dockerFileDir": "grpc_interop_stress_cxx",
-            "buildType": "asan"
-        }
-   },
+  "dockerImages": {
+    "grpc_stress_cxx_opt" : {
+      "buildScript": "tools/jenkins/build_interop_stress_image.sh",
+      "dockerFileDir": "grpc_interop_stress_cxx",
+      "buildType": "opt"
+    },
+    "grpc_stress_cxx_tsan": {
+      "buildScript": "tools/jenkins/build_interop_stress_image.sh",
+      "dockerFileDir": "grpc_interop_stress_cxx",
+      "buildType": "tsan"
+    },
+    "grpc_stress_cxx_asan": {
+      "buildScript": "tools/jenkins/build_interop_stress_image.sh",
+      "dockerFileDir": "grpc_interop_stress_cxx",
+      "buildType": "asan"
+    }
+  },
 
-    "clientTemplates": {
-      "baseTemplates": {
-        "default": {
-          "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_client.py",
-          "pollIntervalSecs": 60,
-          "clientArgs": {
-            "num_channels_per_server":5,
-            "num_stubs_per_channel":10,
-            "test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
-            "metrics_port": 8081,
-            "metrics_collection_interval_secs":60
-          },
-          "metricsPort": 8081,
-          "metricsArgs": {
-            "metrics_server_address": "localhost:8081",
-            "total_only": "true"
-          }
-        }
-      },
-      "templates": {
-        "cxx_client_opt": {
-          "baseTemplate": "default",
-          "clientImagePath": "/var/local/git/grpc/bins/opt/stress_test",
-          "metricsClientImagePath": "/var/local/git/grpc/bins/opt/metrics_client"
-        },
-        "cxx_client_tsan": {
-          "baseTemplate": "default",
-          "clientImagePath": "/var/local/git/grpc/bins/tsan/stress_test",
-          "metricsClientImagePath": "/var/local/git/grpc/bins/tsan/metrics_client"
+  "clientTemplates": {
+    "baseTemplates": {
+      "default": {
+        "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_client.py",
+        "pollIntervalSecs": 60,
+        "clientArgs": {
+          "num_channels_per_server":5,
+          "num_stubs_per_channel":10,
+          "test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
+          "metrics_port": 8081,
+          "metrics_collection_interval_secs":60
         },
-	    "cxx_client_asan": {
-          "baseTemplate": "default",
-          "clientImagePath": "/var/local/git/grpc/bins/asan/stress_test",
-          "metricsClientImagePath": "/var/local/git/grpc/bins/asan/metrics_client"
+        "metricsPort": 8081,
+        "metricsArgs": {
+          "metrics_server_address": "localhost:8081",
+          "total_only": "true"
         }
       }
     },
-
-    "serverTemplates": {
-      "baseTemplates":{
-        "default": {
-          "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_server.py",
-          "serverPort": 8080,
-          "serverArgs": {
-            "port": 8080
-          }
-        }
+    "templates": {
+      "cxx_client_opt": {
+        "baseTemplate": "default",
+        "clientImagePath": "/var/local/git/grpc/bins/opt/stress_test",
+        "metricsClientImagePath": "/var/local/git/grpc/bins/opt/metrics_client"
       },
-      "templates": {
-        "cxx_server_opt": {
-          "baseTemplate": "default",
-          "serverImagePath": "/var/local/git/grpc/bins/opt/interop_server"
-        },
-        "cxx_server_tsan": {
-          "baseTemplate": "default",
-          "serverImagePath": "/var/local/git/grpc/bins/tsan/interop_server"
-        },
-	    "cxx_server_asan": {
-          "baseTemplate": "default",
-          "serverImagePath": "/var/local/git/grpc/bins/asan/interop_server"
-        }
+      "cxx_client_tsan": {
+        "baseTemplate": "default",
+        "clientImagePath": "/var/local/git/grpc/bins/tsan/stress_test",
+        "metricsClientImagePath": "/var/local/git/grpc/bins/tsan/metrics_client"
+      },
+    "cxx_client_asan": {
+        "baseTemplate": "default",
+        "clientImagePath": "/var/local/git/grpc/bins/asan/stress_test",
+        "metricsClientImagePath": "/var/local/git/grpc/bins/asan/metrics_client"
       }
-    },
-
-    "testMatrix": {
-      "serverPodSpecs": {
-        "stress-server-opt": {
-          "serverTemplate": "cxx_server_opt",
-          "dockerImage": "grpc_stress_cxx_opt",
-          "numInstances": 1
-        },
-        "stress-server-tsan": {
-          "serverTemplate": "cxx_server_tsan",
-          "dockerImage": "grpc_stress_cxx_tsan",
-          "numInstances": 1
-        },
-        "stress-server-asan": {
-          "serverTemplate": "cxx_server_asan",
-          "dockerImage": "grpc_stress_cxx_asan",
-          "numInstances": 1
-        }
-     },
+    }
+  },
 
-      "clientPodSpecs": {
-        "stress-client-opt": {
-          "clientTemplate": "cxx_client_opt",
-          "dockerImage": "grpc_stress_cxx_opt",
-          "numInstances": 3,
-          "serverPodSpec": "stress-server-opt"
-        },
-        "stress-client-tsan": {
-          "clientTemplate": "cxx_client_tsan",
-          "dockerImage": "grpc_stress_cxx_tsan",
-          "numInstances": 3,
-          "serverPodSpec": "stress-server-tsan"
-        },
-        "stress-client-asan": {
-          "clientTemplate": "cxx_client_asan",
-          "dockerImage": "grpc_stress_cxx_asan",
-          "numInstances": 3,
-          "serverPodSpec": "stress-server-asan"
+  "serverTemplates": {
+    "baseTemplates":{
+      "default": {
+        "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_server.py",
+        "serverPort": 8080,
+        "serverArgs": {
+          "port": 8080
         }
       }
     },
+    "templates": {
+      "cxx_server_opt": {
+        "baseTemplate": "default",
+        "serverImagePath": "/var/local/git/grpc/bins/opt/interop_server"
+      },
+      "cxx_server_tsan": {
+        "baseTemplate": "default",
+        "serverImagePath": "/var/local/git/grpc/bins/tsan/interop_server"
+      },
+    "cxx_server_asan": {
+        "baseTemplate": "default",
+        "serverImagePath": "/var/local/git/grpc/bins/asan/interop_server"
+      }
+    }
+  },
 
-    "globalSettings": {
-      "buildDockerImages": false,
-      "pollIntervalSecs": 10,
-      "testDurationSecs": 70,
-      "kubernetesProxyPort": 8001,
-      "datasetIdNamePrefix": "stress_test_opt_tsan",
-      "summaryTableId": "summary",
-      "qpsTableId": "qps",
-      "podWarmupSecs": 60
+  "testMatrix": {
+    "serverPodSpecs": {
+      "stress-server-opt": {
+        "serverTemplate": "cxx_server_opt",
+        "dockerImage": "grpc_stress_cxx_opt",
+        "numInstances": 1
+      },
+      "stress-server-tsan": {
+        "serverTemplate": "cxx_server_tsan",
+        "dockerImage": "grpc_stress_cxx_tsan",
+        "numInstances": 1
+      },
+      "stress-server-asan": {
+        "serverTemplate": "cxx_server_asan",
+        "dockerImage": "grpc_stress_cxx_asan",
+        "numInstances": 1
+      }
+   },
+
+    "clientPodSpecs": {
+      "stress-client-opt": {
+        "clientTemplate": "cxx_client_opt",
+        "dockerImage": "grpc_stress_cxx_opt",
+        "numInstances": 3,
+        "serverPodSpec": "stress-server-opt"
+      },
+      "stress-client-tsan": {
+        "clientTemplate": "cxx_client_tsan",
+        "dockerImage": "grpc_stress_cxx_tsan",
+        "numInstances": 3,
+        "serverPodSpec": "stress-server-tsan"
+      },
+      "stress-client-asan": {
+        "clientTemplate": "cxx_client_asan",
+        "dockerImage": "grpc_stress_cxx_asan",
+        "numInstances": 3,
+        "serverPodSpec": "stress-server-asan"
+      }
     }
-}
+  },
 
+  "globalSettings": {
+    "buildDockerImages": true,
+    "pollIntervalSecs": 60,
+    "testDurationSecs": 7200,
+    "kubernetesProxyPort": 8001,
+    "datasetIdNamePrefix": "stress_test_opt_tsan",
+    "summaryTableId": "summary",
+    "qpsTableId": "qps",
+    "podWarmupSecs": 60
+  }
+}
diff --git a/tools/run_tests/stress_test/configs/opt.json b/tools/run_tests/stress_test/configs/opt.json
index 2569ca16b9..7fc024034b 100644
--- a/tools/run_tests/stress_test/configs/opt.json
+++ b/tools/run_tests/stress_test/configs/opt.json
@@ -1,86 +1,86 @@
 {
-    "dockerImages": {
-        "grpc_stress_cxx_opt" : {
-            "buildScript": "tools/jenkins/build_interop_stress_image.sh",
-            "dockerFileDir": "grpc_interop_stress_cxx",
-            "buildType": "opt"
-        }
-    },
+  "dockerImages": {
+    "grpc_stress_cxx_opt" : {
+      "buildScript": "tools/jenkins/build_interop_stress_image.sh",
+      "dockerFileDir": "grpc_interop_stress_cxx",
+      "buildType": "opt"
+    }
+  },
 
-    "clientTemplates": {
-      "baseTemplates": {
-        "default": {
-          "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_client.py",
-          "pollIntervalSecs": 60,
-          "clientArgs": {
-            "num_channels_per_server":5,
-            "num_stubs_per_channel":10,
-            "test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
-            "metrics_port": 8081,
-            "metrics_collection_interval_secs":60
-          },
-          "metricsPort": 8081,
-          "metricsArgs": {
-            "metrics_server_address": "localhost:8081",
-            "total_only": "true"
-          }
-        }
-      },
-      "templates": {
-        "cxx_client_opt": {
-          "baseTemplate": "default",
-          "clientImagePath": "/var/local/git/grpc/bins/opt/stress_test",
-          "metricsClientImagePath": "/var/local/git/grpc/bins/opt/metrics_client"
+  "clientTemplates": {
+    "baseTemplates": {
+      "default": {
+        "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_client.py",
+        "pollIntervalSecs": 60,
+        "clientArgs": {
+          "num_channels_per_server":5,
+          "num_stubs_per_channel":10,
+          "test_cases": "empty_unary:1,large_unary:1,client_streaming:1,server_streaming:1,empty_stream:1",
+          "metrics_port": 8081,
+          "metrics_collection_interval_secs":60
+        },
+        "metricsPort": 8081,
+        "metricsArgs": {
+          "metrics_server_address": "localhost:8081",
+          "total_only": "true"
         }
       }
     },
+    "templates": {
+      "cxx_client_opt": {
+        "baseTemplate": "default",
+        "clientImagePath": "/var/local/git/grpc/bins/opt/stress_test",
+        "metricsClientImagePath": "/var/local/git/grpc/bins/opt/metrics_client"
+      }
+    }
+  },
 
-    "serverTemplates": {
-      "baseTemplates":{
-        "default": {
-          "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_server.py",
-          "serverPort": 8080,
-          "serverArgs": {
-            "port": 8080
-          }
+  "serverTemplates": {
+    "baseTemplates":{
+      "default": {
+        "wrapperScriptPath": "/var/local/git/grpc/tools/gcp/stress_test/run_server.py",
+        "serverPort": 8080,
+        "serverArgs": {
+          "port": 8080
         }
-      },
-      "templates": {
-        "cxx_server_opt": {
-          "baseTemplate": "default",
-          "serverImagePath": "/var/local/git/grpc/bins/opt/interop_server"
-        }
-	  }
+      }
     },
+    "templates": {
+      "cxx_server_opt": {
+        "baseTemplate": "default",
+        "serverImagePath": "/var/local/git/grpc/bins/opt/interop_server"
+      }
+    }
+  },
 
-    "testMatrix": {
-      "serverPodSpecs": {
-        "stress-server-opt": {
-          "serverTemplate": "cxx_server_opt",
-          "dockerImage": "grpc_stress_cxx_opt",
-          "numInstances": 1
-        }
-      },
-
-      "clientPodSpecs": {
-        "stress-client-opt": {
-          "clientTemplate": "cxx_client_opt",
-          "dockerImage": "grpc_stress_cxx_opt",
-          "numInstances": 10,
-          "serverPodSpec": "stress-server-opt"
-        }
+  "testMatrix": {
+    "serverPodSpecs": {
+      "stress-server-opt": {
+        "serverTemplate": "cxx_server_opt",
+        "dockerImage": "grpc_stress_cxx_opt",
+        "numInstances": 1
       }
     },
 
-    "globalSettings": {
-      "buildDockerImages": false,
-      "pollIntervalSecs": 10,
-      "testDurationSecs": 70,
-      "kubernetesProxyPort": 8001,
-      "datasetIdNamePrefix": "stress_test_opt",
-      "summaryTableId": "summary",
-      "qpsTableId": "qps",
-      "podWarmupSecs": 60
+    "clientPodSpecs": {
+      "stress-client-opt": {
+        "clientTemplate": "cxx_client_opt",
+        "dockerImage": "grpc_stress_cxx_opt",
+        "numInstances": 10,
+        "serverPodSpec": "stress-server-opt"
+      }
     }
+  },
+
+  "globalSettings": {
+    "buildDockerImages": true,
+    "pollIntervalSecs": 10,
+    "testDurationSecs": 120,
+    "kubernetesProxyPort": 8001,
+    "datasetIdNamePrefix": "stress_test_opt",
+    "summaryTableId": "summary",
+    "qpsTableId": "qps",
+    "podWarmupSecs": 60
+  }
 }
 
diff --git a/tools/run_tests/stress_test/run_on_gke.py b/tools/run_tests/stress_test/run_on_gke.py
index c948582ddc..3a81c1a376 100755
--- a/tools/run_tests/stress_test/run_on_gke.py
+++ b/tools/run_tests/stress_test/run_on_gke.py
@@ -93,9 +93,8 @@ class ServerTemplate:
 
 
 class DockerImage:
-  """ Represents a docker image properties and has methods to build the image and
-
-  push it to GKE registry
+  """ Represents properties of a Docker image. Provides methods to build the
+  image and push it to GKE registry
   """
 
   def __init__(self, gcp_project_id, image_name, build_script_path,