Rollback some changes

3 files changed, 30 insertions, 32 deletions

diff --git a/build.yaml b/build.yaml
index 58a474aabf..f2af370522 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3806,7 +3806,7 @@ targets:
   - grpc++
   - grpc
 - name: grpclb_test
-  gtest: false
+  cpu_cost: 0.1
   build: test
   language: c++
   src:
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py
index 2edcb86a68..805b0faeec 100755
--- a/test/cpp/qps/gen_build_yaml.py
+++ b/test/cpp/qps/gen_build_yaml.py
@@ -65,8 +65,6 @@ def _scenario_json_string(scenario_json, is_tsan):
 
 def threads_required(scenario_json, where, is_tsan):
   scenario_json = mutate_scenario(scenario_json, is_tsan)
-  if scenario_json['client_config']['outstanding_rpcs_per_channel'] == 1 and scenario_json['client_config']['client_channels'] == 1:
-    return 0.4
   if scenario_json['%s_config' % where]['%s_type' % where] == 'ASYNC_%s' % where.upper():
     if scenario_json['client_config']['client_channels'] == 1: return 1
     return scenario_json['%s_config' % where].get('async_%s_threads' % where, 0)
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 203f51b6b8..cb918a0830 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -3403,7 +3403,7 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 1.0, 
+    "cpu_cost": 0.1, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
@@ -41250,7 +41250,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41452,7 +41452,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41504,7 +41504,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41529,7 +41529,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41579,7 +41579,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41629,7 +41629,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41729,7 +41729,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41829,7 +41829,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42031,7 +42031,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42083,7 +42083,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42108,7 +42108,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42158,7 +42158,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42208,7 +42208,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42308,7 +42308,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42408,7 +42408,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -42714,7 +42714,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -42792,7 +42792,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -42830,7 +42830,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -42906,7 +42906,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -42982,7 +42982,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43134,7 +43134,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43286,7 +43286,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43592,7 +43592,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43670,7 +43670,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43708,7 +43708,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43784,7 +43784,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43860,7 +43860,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -44012,7 +44012,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 2, 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks",