commit 815c589d7f5cd912f0785da2f4d4f1e88a343242
author Sree Kuchibhotla <sreek@google.com> Fri Mar 25 15:03:50 2016 -0700
committer Sree Kuchibhotla <sreek@google.com> Mon Mar 28 09:16:49 2016 -0700
tree b67094fed3be1fe860d65cf0787f287558d21b55
parent 8d41d518004077b522540c9156983fddd9d37dec

Pass gcp_project_id via command line. Makes it easier to run on
different projects with the same configuration

tools/run_tests/stress_test/configs/opt-tsan.json

diff --git a/tools/run_tests/stress_test/configs/opt-tsan.json b/tools/run_tests/stress_test/configs/opt-tsan.json
index dab78e5..e0e4873 100644
--- a/tools/run_tests/stress_test/configs/opt-tsan.json
+++ b/tools/run_tests/stress_test/configs/opt-tsan.json
@@ -98,7 +98,6 @@
     },
 
     "globalSettings": {
-      "projectId": "sreek-gce",
       "buildDockerImages": true,
       "pollIntervalSecs": 60,
       "testDurationSecs": 120,

tools/run_tests/stress_test/run_on_gke.py

diff --git a/tools/run_tests/stress_test/run_on_gke.py b/tools/run_tests/stress_test/run_on_gke.py
index c301cf4..4ef53f1 100755
--- a/tools/run_tests/stress_test/run_on_gke.py
+++ b/tools/run_tests/stress_test/run_on_gke.py
@@ -307,9 +307,9 @@
 
 class Config:
 
-  def __init__(self, config_filename):
+  def __init__(self, config_filename, gcp_project_id):
     config_dict = self.load_config(config_filename)
-    self.global_settings = self.parse_global_settings(config_dict)
+    self.global_settings = self.parse_global_settings(config_dict, gcp_project_id)
     self.docker_images_dict = self.parse_docker_images(
         config_dict, self.global_settings.gcp_project_id)
     self.client_templates_dict = self.parse_client_templates(config_dict)
@@ -320,9 +320,9 @@
         config_dict, self.docker_images_dict, self.client_templates_dict,
         self.server_pod_specs_dict)
 
-  def parse_global_settings(self, config_dict):
+  def parse_global_settings(self, config_dict, gcp_project_id):
     global_settings_dict = config_dict['globalSettings']
-    return GlobalSettings(global_settings_dict['projectId'],
+    return GlobalSettings(gcp_project_id,
                           global_settings_dict['buildDockerImages'],
                           global_settings_dict['pollIntervalSecs'],
                           global_settings_dict['testDurationSecs'],
@@ -564,7 +564,7 @@
 argp = argparse.ArgumentParser(
     description='Launch stress tests in GKE',
     formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-argp.add_argument('--project_id',
+argp.add_argument('--gcp_project_id',
                   required=True,
                   help='The Google Cloud Platform Project Id')
 argp.add_argument('--config_file',
@@ -574,5 +574,5 @@
 
 if __name__ == '__main__':
   args = argp.parse_args()
-  config = Config(args.config_file)
+  config = Config(args.config_file, args.gcp_project_id)
   run_tests(config)