From 117c8af8d327455e63edae275cfd7d5469fd2d19 Mon Sep 17 00:00:00 2001
From: Sree Kuchibhotla <sreek@google.com>
Date: Mon, 26 Oct 2015 10:59:17 -0700
Subject: [PATCH] Skip running stress_tests on jenkins by run_tests.py (This
 will fix the issue addressed by commit: e6cd0e70a9c8, the right way)

---
 build.yaml                      | 1 +
 test/cpp/interop/stress_test.cc | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/build.yaml b/build.yaml
index 4f6e35b0de..dadd9429e2 100644
--- a/build.yaml
+++ b/build.yaml
@@ -2107,6 +2107,7 @@ targets:
   - posix
 - name: stress_test
   build: test
+  run: false
   language: c++
   headers:
   - test/cpp/interop/client_helper.h
diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc
index a1f6780809..0340c8d9d4 100644
--- a/test/cpp/interop/stress_test.cc
+++ b/test/cpp/interop/stress_test.cc
@@ -187,14 +187,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");
-
-    // 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;
+    return 1;
   }
 
   vector<pair<TestCaseType, int>> tests;
-- 
GitLab