Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1041)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json

Issue 2446313004: [blimp] Run compile with use_goma_module=True on blimp/integration. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/blimp/integration.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
diff --git a/scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json b/scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
index 273e6892d9c6766ced75c41b85c373765da0c0dd..909f073f69c71694e334295cf72f055fb52d5c32 100644
--- a/scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
+++ b/scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
@@ -226,50 +226,153 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
+ "\nimport multiprocessing\nimport sys\n\njob_limit = 200\nif sys.platform.startswith('linux'):\n # Use 80 for linux not to load goma backend.\n job_limit = 80\n\ntry:\n jobs = min(job_limit, multiprocessing.cpu_count() * 10)\nexcept NotImplementedError:\n jobs = 50\n\nprint jobs\n"
+ ],
+ "name": "calculate the number of recommended jobs",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import multiprocessing@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@job_limit = 200@@@",
+ "@@@STEP_LOG_LINE@python.inline@if sys.platform.startswith('linux'):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # Use 80 for linux not to load goma backend.@@@",
+ "@@@STEP_LOG_LINE@python.inline@ job_limit = 80@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@try:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ jobs = min(job_limit, multiprocessing.cpu_count() * 10)@@@",
+ "@@@STEP_LOG_LINE@python.inline@except NotImplementedError:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ jobs = 50@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@print jobs@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "restart"
+ ],
+ "env": {
+ "GOMA_ALLOWED_NETWORK_ERROR_DURATION": "1800",
+ "GOMA_CACHE_DIR": "[GOMA_CACHE]",
+ "GOMA_DEPS_CACHE_FILE": "Blimp_Client_Engine_Integration.gomadeps",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "start_goma"
+ },
+ {
+ "cmd": [
"python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--ninja-path",
+ "-u",
+ "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+ "start",
+ "--cloudtail-path",
+ "[CACHE]/cipd/goma/cloudtail",
+ "--pid-file",
+ "[TMP_BASE]/cloudtail.pid"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "start cloudtail"
+ },
+ {
+ "cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/ninja",
- "--target",
- "Debug",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
+ "-w",
+ "dupbuild=err",
+ "-C",
+ "[SLAVE_BUILD]/src/[SLAVE_BUILD]/src/out-linux/Debug",
+ "-j",
+ "50",
+ "blimp"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "compile with ninja"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "jsonstatus",
+ "[CACHE]/cipd/goma/jsonstatus"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "goma_jsonstatus"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "stat"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "goma_stat"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "stop"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "stop_goma"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/upload_goma_logs.py",
+ "--upload-compiler-proxy-info",
+ "--json-status",
+ "[CACHE]/cipd/goma/jsonstatus",
+ "--ninja-log-outdir",
+ "[SLAVE_BUILD]/src/[SLAVE_BUILD]/src/out-linux/Debug",
+ "--ninja-log-compiler",
+ "goma",
+ "--ninja-log-command",
+ "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-w', 'dupbuild=err', '-C', '[SLAVE_BUILD]/src/[SLAVE_BUILD]/src/out-linux/Debug', '-j', 50, 'blimp']",
+ "--ninja-log-exit-status",
+ "0",
"--buildbot-buildername",
"Blimp Client Engine Integration",
"--buildbot-mastername",
"chromium.fyi",
"--buildbot-slavename",
- "TestSlavename",
- "--goma-deps-cache-file",
- "Blimp_Client_Engine_Integration.gomadeps",
- "--compiler",
- "goma",
- "--goma-jsonstatus",
- "/path/to/tmp/json",
- "--goma-service-account-json-file",
- "/creds/service_accounts/service-account-goma-client.json",
- "--out-dir",
- "[SLAVE_BUILD]/src/out-linux",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "--",
- "blimp"
+ "TestSlavename"
],
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "compile",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@"
- ]
+ "name": "upload_log"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+ "stop",
+ "--killed-pid-file",
+ "[TMP_BASE]/cloudtail.pid"
+ ],
+ "name": "stop cloudtail"
},
{
"cmd": [
@@ -299,51 +402,127 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "restart"
+ ],
+ "env": {
+ "GOMA_ALLOWED_NETWORK_ERROR_DURATION": "1800",
+ "GOMA_CACHE_DIR": "[GOMA_CACHE]",
+ "GOMA_DEPS_CACHE_FILE": "Blimp_Client_Engine_Integration.gomadeps",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "start_goma (2)"
+ },
+ {
+ "cmd": [
"python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--ninja-path",
+ "-u",
+ "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+ "start",
+ "--cloudtail-path",
+ "[CACHE]/cipd/goma/cloudtail",
+ "--pid-file",
+ "[TMP_BASE]/cloudtail.pid"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "start cloudtail (2)"
+ },
+ {
+ "cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/ninja",
- "--target",
- "Debug",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
+ "-w",
+ "dupbuild=err",
+ "-C",
+ "[SLAVE_BUILD]/src/[SLAVE_BUILD]/src/out-android/Debug",
+ "-j",
+ "50",
+ "blimp",
+ "chrome_public_apk"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "compile with ninja (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "jsonstatus",
+ "[CACHE]/cipd/goma/jsonstatus"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "goma_jsonstatus (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "stat"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "goma_stat (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CACHE]/cipd/goma/goma_ctl.py",
+ "stop"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "stop_goma (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/upload_goma_logs.py",
+ "--upload-compiler-proxy-info",
+ "--json-status",
+ "[CACHE]/cipd/goma/jsonstatus",
+ "--ninja-log-outdir",
+ "[SLAVE_BUILD]/src/[SLAVE_BUILD]/src/out-android/Debug",
+ "--ninja-log-compiler",
+ "goma",
+ "--ninja-log-command",
+ "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-w', 'dupbuild=err', '-C', '[SLAVE_BUILD]/src/[SLAVE_BUILD]/src/out-android/Debug', '-j', 50, 'blimp', 'chrome_public_apk']",
+ "--ninja-log-exit-status",
+ "0",
"--buildbot-buildername",
"Blimp Client Engine Integration",
"--buildbot-mastername",
"chromium.fyi",
"--buildbot-slavename",
- "TestSlavename",
- "--goma-deps-cache-file",
- "Blimp_Client_Engine_Integration.gomadeps",
- "--compiler",
- "goma",
- "--goma-jsonstatus",
- "/path/to/tmp/json",
- "--goma-service-account-json-file",
- "/creds/service_accounts/service-account-goma-client.json",
- "--out-dir",
- "[SLAVE_BUILD]/src/out-android",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "--",
- "blimp",
- "chrome_public_apk"
+ "TestSlavename"
],
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "compile (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@"
- ]
+ "name": "upload_log (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+ "stop",
+ "--killed-pid-file",
+ "[TMP_BASE]/cloudtail.pid"
+ ],
+ "name": "stop cloudtail (2)"
},
{
"name": "$result",
« no previous file with comments | « scripts/slave/recipes/blimp/integration.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698