More config files

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

@@ -9,8 +9,13 @@
             "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": {
@@ -41,6 +46,11 @@
           "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"
         }
       }
     },
@@ -63,6 +73,10 @@
         "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"
         }
       }
     },
@@ -78,8 +92,13 @@
           "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": {
@@ -88,6 +107,12 @@
           "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-tsan": {
           "clientTemplate": "cxx_client_tsan",
           "dockerImage": "grpc_stress_cxx_tsan",
@@ -98,7 +123,7 @@
     },
 
     "globalSettings": {
-      "buildDockerImages": false,
+      "buildDockerImages": true,
       "pollIntervalSecs": 10,
       "testDurationSecs": 70,
       "kubernetesProxyPort": 8001,

tools/run_tests/stress_test/configs/opt.json

+{
+    "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"
+        }
+      }
+    },
+
+    "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"
+        }
+	  }
+    },
+
+    "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"
+        }
+      }
+    },
+
+    "globalSettings": {
+      "buildDockerImages": false,
+      "pollIntervalSecs": 10,
+      "testDurationSecs": 70,
+      "kubernetesProxyPort": 8001,
+      "datasetIdNamePrefix": "stress_test_opt",
+      "summaryTableId": "summary",
+      "qpsTableId": "qps",
+      "podWarmupSecs": 60
+    }
+}
+

tools/run_tests/stress_test/run_on_gke.py

@@ -608,10 +608,12 @@ if __name__ == '__main__':
 
   config_filename = args.config_file
 
-  # Convert config_filename to absolute path
+  # Since we will be changing the current working directory to grpc root in the
+  # next step, we should check if the config filename path is a relative path
+  # (i.e a path relative to the current working directory) and if so, convert it
+  # to abosulte path
   if not os.path.isabs(config_filename):
-    config_filename = os.path.abspath(os.path.join(
-        os.path.dirname(sys.argv[0]), config_filename))
+    config_filename = os.path.abspath(config_filename)
 
   config = Config(config_filename, args.gcp_project_id)