diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-01-04 11:37:17 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-04 17:37:54 +0000 |
| commit | 6dbff086f0a20e433e2d687359bdb54219b538f7 (patch) | |
| tree | 802f48801904510cb6648e24806d1f058fbfcdb3 /infra/bots/recipe_modules/vars | |
| parent | 243f605ce9fb3d7c91a1c49e8f052dd4d00db8a0 (diff) | |
Add support for Build...ParentRevision tasks.
Bug: skia:7344
Change-Id: I458afe4abe5edff8b8ccbd5abdaf4ebbf892ee00
Reviewed-on: https://skia-review.googlesource.com/90245
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/vars')
3 files changed, 41 insertions, 0 deletions
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 92a61c2f60..2106645781 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -93,6 +93,11 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.images_dir = self.slave_dir.join('skimage') self.skia_out = self.skia_dir.join('out', self.builder_name) self.swarming_out_dir = self.make_path(self.m.properties['swarm_out_dir']) + if 'ParentRevision' in self.builder_name: + # Tasks that depend on ParentRevision builds usually also depend on a + # second build task. Use a different path for build results so that the + # binaries end up in different directories in the isolate. + self.swarming_out_dir = self.swarming_out_dir.join('ParentRevision') self.local_skp_dir = self.slave_dir.join('skp') self.local_svg_dir = self.slave_dir.join('svg') if not self.is_compile_bot: diff --git a/infra/bots/recipe_modules/vars/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json b/infra/bots/recipe_modules/vars/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/examples/full.py b/infra/bots/recipe_modules/vars/examples/full.py index b1a0af9230..d2a5c44fc2 100644 --- a/infra/bots/recipe_modules/vars/examples/full.py +++ b/infra/bots/recipe_modules/vars/examples/full.py @@ -22,6 +22,7 @@ def RunSteps(api): TEST_BUILDERS = [ + 'Build-Debian9-Clang-x86_64-Release-ParentRevision', 'Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD', 'Build-Debian9-GCC-x86_64-Release-Flutter_Android', 'Build-Debian9-GCC-x86_64-Release-PDFium', |