Merge pull request #3962 from sreecha/skip_stress_tests

Skip running stress_tests on jenkins by run_tests.py

Makefile

@@ -3560,8 +3560,6 @@ test_cxx: test_zookeeper buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/status_test || ( echo test status_test failed ; exit 1 )
 	$(E) "[RUN]     Testing streaming_throughput_test"
 	$(Q) $(BINDIR)/$(CONFIG)/streaming_throughput_test || ( echo test streaming_throughput_test failed ; exit 1 )
-	$(E) "[RUN]     Testing stress_test"
-	$(Q) $(BINDIR)/$(CONFIG)/stress_test || ( echo test stress_test failed ; exit 1 )
 	$(E) "[RUN]     Testing sync_streaming_ping_pong_test"
 	$(Q) $(BINDIR)/$(CONFIG)/sync_streaming_ping_pong_test || ( echo test sync_streaming_ping_pong_test failed ; exit 1 )
 	$(E) "[RUN]     Testing sync_unary_ping_pong_test"

build.yaml

@@ -2107,6 +2107,7 @@ targets:
   - posix
 - name: stress_test
   build: test
+  run: false
   language: c++
   headers:
   - test/cpp/interop/client_helper.h

test/cpp/interop/stress_test.cc

@@ -186,14 +186,7 @@ int main(int argc, char** argv) {
   // Parse test cases and weights
   if (FLAGS_test_cases.length() == 0) {
     gpr_log(GPR_INFO, "Not running tests. The 'test_cases' string is empty");
-
+    return 1;
-    // TODO(sreek): stress_tests is currently being run by run_tests.py in
-    // jenkins. There does not seem to be a straightforward way to skip this.
-    // So, for now, return 0 (i.e success) to keep jenkins build happy. Moreover
-    // we don't want to run stress_tests (for now) in jenkins anyway.
-    // Once we figure out a good way to skip this tests in run_tests.py, I will
-    // change this to 'return 1'
-    return 0;
   }
 
   vector<pair<TestCaseType, int>> tests;

tools/run_tests/tests.json

@@ -1617,24 +1617,6 @@
       "posix"
     ]
   }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c++", 
-    "name": "stress_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
   {
     "ci_platforms": [
       "linux",