diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-02-15 05:33:10 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-12 16:01:38 +0000 |
| commit | cf81fa995f3806d1c35b555fb9420488b8a14517 (patch) | |
| tree | 273d3e71d2c7a2ef8e21d99cffccfc875c4146ec /infra/bots | |
| parent | 554aa6a9e27160bc0a6562c2d93a46325a90978b (diff) | |
Use goma ensure_stop.
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>
Diffstat (limited to 'infra/bots')
4 files changed, 4 insertions, 77 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json index 2611037a3d..80b8693996 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json @@ -172,7 +172,7 @@ "python", "-u", "goma_ctl.py", - "stop" + "ensure_stop" ], "cwd": "[CACHE]/goma", "env": { @@ -189,30 +189,6 @@ "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, "status_code": 0 diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json index 51e8c81440..e3705f1ede 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json @@ -160,7 +160,7 @@ "python", "-u", "goma_ctl.py", - "stop" + "ensure_stop" ], "cwd": "[CACHE]/goma", "env": { @@ -174,27 +174,6 @@ "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, "status_code": 0 diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json index 0999cc537f..53daade380 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json @@ -160,7 +160,7 @@ "python", "-u", "goma_ctl.py", - "stop" + "ensure_stop" ], "cwd": "[CACHE]/goma", "env": { @@ -174,27 +174,6 @@ "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, "status_code": 0 diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 41965932e7..115cb2aaff 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -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) |