Fix GYP-based closure try bots while they continue getting ported to GN
R=iannucci@chromium.org
BUG=644563
Review-Url: https://codereview.chromium.org/2315123002
diff --git a/scripts/slave/recipes/closure_compilation.expected/closure_compilation_fyi.json b/scripts/slave/recipes/closure_compilation.expected/closure_compilation_fyi.json
index 31539d4..a2a99e5 100644
--- a/scripts/slave/recipes/closure_compilation.expected/closure_compilation_fyi.json
+++ b/scripts/slave/recipes/closure_compilation.expected/closure_compilation_fyi.json
@@ -114,79 +114,9 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/gyp_chromium",
- "[SLAVE_BUILD]/src/third_party/closure_compiler/compiled_resources.gyp"
+ "[SLAVE_BUILD]/src/third_party/closure_compiler/run_compiler"
],
- "name": "generate_gyp_files"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--ninja-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
- "--target",
- "Release",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
- "--buildbot-buildername",
- "Closure Compilation Linux",
- "--buildbot-mastername",
- "chromium.fyi",
- "--buildbot-slavename",
- "TestSlavename",
- "--"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "compile"
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/src/build/gyp_chromium",
- "[SLAVE_BUILD]/src/third_party/closure_compiler/compiled_resources2.gyp"
- ],
- "name": "generate_v2_gyp_files"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--ninja-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
- "--target",
- "Release",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
- "--buildbot-buildername",
- "Closure Compilation Linux",
- "--buildbot-mastername",
- "chromium.fyi",
- "--buildbot-slavename",
- "TestSlavename",
- "--"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "compile_v2"
+ "name": "run_compiler"
},
{
"name": "$result",
diff --git a/scripts/slave/recipes/closure_compilation.expected/closure_compilation_try.json b/scripts/slave/recipes/closure_compilation.expected/closure_compilation_try.json
index 8f4b7ff..829c8ca 100644
--- a/scripts/slave/recipes/closure_compilation.expected/closure_compilation_try.json
+++ b/scripts/slave/recipes/closure_compilation.expected/closure_compilation_try.json
@@ -114,83 +114,13 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/gyp_chromium",
- "[SLAVE_BUILD]/src/third_party/closure_compiler/compiled_resources.gyp"
+ "[SLAVE_BUILD]/src/third_party/closure_compiler/run_compiler"
],
- "name": "generate_gyp_files"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--ninja-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
- "--target",
- "Release",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
- "--buildbot-buildername",
- "closure_compilation",
- "--buildbot-mastername",
- "tryserver.chromium.linux",
- "--buildbot-slavename",
- "TestSlavename",
- "--"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "compile"
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/src/build/gyp_chromium",
- "[SLAVE_BUILD]/src/third_party/closure_compiler/compiled_resources2.gyp"
- ],
- "name": "generate_v2_gyp_files"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--ninja-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
- "--target",
- "Release",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
- "--buildbot-buildername",
- "closure_compilation",
- "--buildbot-mastername",
- "tryserver.chromium.linux",
- "--buildbot-slavename",
- "TestSlavename",
- "--"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "compile_v2"
+ "name": "run_compiler"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
-]
\ No newline at end of file
+]
diff --git a/scripts/slave/recipes/closure_compilation.py b/scripts/slave/recipes/closure_compilation.py
index c3451d0..f353e4f 100644
--- a/scripts/slave/recipes/closure_compilation.py
+++ b/scripts/slave/recipes/closure_compilation.py
@@ -40,23 +40,11 @@
)
api.step(
- 'generate_gyp_files',
- [api.path['checkout'].join('build', 'gyp_chromium'),
- api.path['checkout'].join('third_party', 'closure_compiler',
- 'compiled_resources.gyp')],
+ 'run_compiler',
+ [api.path['checkout'].join('third_party', 'closure_compiler',
+ 'run_compiler')]
)
- api.chromium.compile()
-
- api.step(
- 'generate_v2_gyp_files',
- [api.path['checkout'].join('build', 'gyp_chromium'),
- api.path['checkout'].join('third_party', 'closure_compiler',
- 'compiled_resources2.gyp')],
- )
-
- api.chromium.compile(name='compile_v2')
-
def GenTests(api):
for mastername, config in MASTERS.iteritems():
