diff options
Diffstat (limited to 'infra/bots')
| -rw-r--r-- | infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json | 12 | ||||
| -rw-r--r-- | infra/bots/recipes/swarm_trigger.py | 9 |
2 files changed, 10 insertions, 11 deletions
diff --git a/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json index bcff912b23..cc77eebc2c 100644 --- a/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json @@ -375,13 +375,13 @@ "repository=skia", "buildername=Build-Ubuntu-GCC-x86_64-Debug-Trybot", "mastername=client.skia.compile", - "patch_issue=2100", "patch_storage=gerrit", + "patch_ref=refs/changes/00/2100/2", "buildnumber=1", "slavename=skiabot-dummy-compile-slave", "reason=Triggered by Skia swarm_trigger Recipe", "swarm_out_dir=${ISOLATED_OUTDIR}", - "patch_ref=refs/changes/00/2100/2", + "patch_issue=2100", "revision=abc123" ], "name": "[trigger] compile_skia on Ubuntu", @@ -654,13 +654,13 @@ "repository=skia", "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot", "mastername=client.skia", - "patch_issue=2100", "patch_storage=gerrit", + "patch_ref=refs/changes/00/2100/2", "buildnumber=5", "slavename=skiabot-linux-swarm-000", "reason=Triggered by Skia swarm_trigger Recipe", "swarm_out_dir=${ISOLATED_OUTDIR}", - "patch_ref=refs/changes/00/2100/2", + "patch_issue=2100", "revision=abc123" ], "name": "[trigger] test_skia on Ubuntu", @@ -898,13 +898,13 @@ "repository=skia", "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot", "mastername=client.skia", - "patch_issue=2100", "patch_storage=gerrit", + "patch_ref=refs/changes/00/2100/2", "buildnumber=5", "slavename=skiabot-linux-swarm-000", "reason=Triggered by Skia swarm_trigger Recipe", "swarm_out_dir=${ISOLATED_OUTDIR}", - "patch_ref=refs/changes/00/2100/2", + "patch_issue=2100", "revision=abc123" ], "name": "[trigger] upload_dm_results_skia on Linux", diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py index 2547c79b97..40b5499cd6 100644 --- a/infra/bots/recipes/swarm_trigger.py +++ b/infra/bots/recipes/swarm_trigger.py @@ -142,7 +142,7 @@ def swarm_dimensions(builder_cfg): dimensions['device'] = { # TODO(stephana): Remove this temporary discrepancy between the bot name # and device. When we expand iOS testing names and devices need to match - # again. + # again. 'iPad4': 'iPad5,1', }[builder_cfg['model']] # TODO(borenet): Replace this hack with something better. @@ -217,11 +217,10 @@ def trigger_task(api, task_name, builder, master, slave, buildnumber, } if builder_cfg['is_trybot']: if api.properties.get('patch_storage') == 'gerrit': - properties['patch_storage'] = api.properties['patch_storage'] properties['repository'] = api.properties['repository'] - properties['patch_ref'] = api.properties['patch_ref'] - properties['patch_set'] = api.properties['patch_set'] - properties['patch_issue'] = api.properties['patch_issue'] + for prop in api.properties: + if prop.startswith('patch_'): + properties[prop] = api.properties[prop] else: properties['issue'] = str(api.properties['issue']) properties['patchset'] = str(api.properties['patchset']) |