From c6f6663fb7b8c4b1614b6f881abf966d48cb87c4 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 24 Apr 2017 08:29:39 -0700
Subject: [PATCH] Rollback some changes

---
 build.yaml                           |  2 +-
 test/cpp/qps/gen_build_yaml.py       |  1 -
 tools/run_tests/generated/tests.json | 26 +++++++++++++-------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/build.yaml b/build.yaml
index f2af370522e..58a474aabf1 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3806,7 +3806,7 @@ targets:
   - grpc++
   - grpc
 - name: grpclb_test
-  cpu_cost: 0.1
+  gtest: false
   build: test
   language: c++
   src:
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py
index 805b0faeece..2f035abeddc 100755
--- a/test/cpp/qps/gen_build_yaml.py
+++ b/test/cpp/qps/gen_build_yaml.py
@@ -66,7 +66,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['%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)
   return scenario_json['client_config']['outstanding_rpcs_per_channel'] * scenario_json['client_config']['client_channels']
 
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index cb918a0830a..120a84e8a4b 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -3403,7 +3403,7 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 0.1, 
+    "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
@@ -41350,7 +41350,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 100, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41452,7 +41452,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41504,7 +41504,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -41929,7 +41929,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 100, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42031,7 +42031,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42083,7 +42083,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "tsan", 
@@ -42560,7 +42560,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 100, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -42714,7 +42714,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -42792,7 +42792,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43438,7 +43438,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 100, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43592,7 +43592,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks", 
@@ -43670,7 +43670,7 @@
     "ci_platforms": [
       "linux"
     ], 
-    "cpu_cost": 2, 
+    "cpu_cost": "capacity", 
     "defaults": "boringssl", 
     "exclude_configs": [
       "asan-noleaks",