AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use goma ensure_stop.

Browse Source 
Bug: b/72128121
No-Try: true
Change-Id: I34ae57e1e6caa18fd22c0a9151206142323c094e
Reviewed-on: https://skia-review.googlesource.com/107560
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2018-02-15 05:33:10 -05:00 committed by Skia Commit-Bot
parent 554aa6a9e2
commit cf81fa995f
4 changed files with 4 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json
View File

@ -172,7 +172,7 @@
"python",
"-u",
"goma_ctl.py",
"stop"
"ensure_stop"
],
"cwd": "[CACHE]/goma",
"env": {
@ -188,30 +188,6 @@
"infra_step": true,
"name": "stop goma"
},
{
"cmd": [
"python",
"-u",
"import time; time.sleep(2)"
],
"cwd": "[CACHE]/goma",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
"GOMA_FALLBACK": "0",
"GOMA_HERMETIC": "error",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
"GOMA_USE_LOCAL": "0",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback"
},
"infra_step": true,
"name": "wait for goma_ctl stop",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import time; time.sleep(2)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,

23
infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json
View File

@ -160,7 +160,7 @@
"python",
"-u",
"goma_ctl.py",
"stop"
"ensure_stop"
],
"cwd": "[CACHE]/goma",
"env": {
@ -173,27 +173,6 @@
"infra_step": true,
"name": "stop goma"
},
{
"cmd": [
"python",
"-u",
"import time; time.sleep(2)"
],
"cwd": "[CACHE]/goma",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma"
},
"infra_step": true,
"name": "wait for goma_ctl stop",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import time; time.sleep(2)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,

23
infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json
View File

@ -160,7 +160,7 @@
"python",
"-u",
"goma_ctl.py",
"stop"
"ensure_stop"
],
"cwd": "[CACHE]/goma",
"env": {
@ -173,27 +173,6 @@
"infra_step": true,
"name": "stop goma"
},
{
"cmd": [
"python",
"-u",
"import time; time.sleep(2)"
],
"cwd": "[CACHE]/goma",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma"
},
"infra_step": true,
"name": "wait for goma_ctl stop",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import time; time.sleep(2)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,

9
infra/bots/recipe_modules/flavor/gn_flavor.py
View File

@ -262,14 +262,7 @@ with open(sys.argv[1], 'w') as f:
script='goma_ctl.py', args=['stat'], infra_step=True,
abort_on_failure=False, fail_build_on_failure=False)
self.m.run(self.m.python, 'stop goma',
script='goma_ctl.py', args=['stop'], infra_step=True,
abort_on_failure=False, fail_build_on_failure=False)
# Hack: goma_ctl stop is asynchronous, so the process often does not
# stop before the recipe exits, which causes Swarming to freak out.
# Wait a couple seconds for it to exit normally.
# TODO(dogben): Remove after internal b/72128121 is resolved.
self.m.run(self.m.python.inline, 'wait for goma_ctl stop',
program="""import time; time.sleep(2)""",
script='goma_ctl.py', args=['ensure_stop'],
infra_step=True,
abort_on_failure=False, fail_build_on_failure=False)