Reland "trigger_scripts: remove some code for flag conversion"
This reverts commit e361e8ebea8ddfa24870af1f64bea8ded7ddaf4e.
Reason for revert:
fixing CL is relanded.
https://crrev.com/c/2662436
Original change's description:
> Revert "trigger_scripts: remove some code for flag conversion"
>
> This reverts commit e99f66adfc17bf990e3a780ac7a3ee7257335fa7.
>
> Reason for revert: "swarming: failed to call NewTask"
> https://ci.chromium.org/p/chrome/builders/ci/chromeos-eve-chrome/12420
>
> Original change's description:
> > trigger_scripts: remove some code for flag conversion
> >
> > https://crrev.com/c/2646794 passes go flag directly.
> >
> > Bug: 1127205
> > Cq-Include-Trybots: luci.chromium.try:chromeos-kevin-rel
> > Change-Id: I9f937c0b545fa265384c2d53723fa4dbea0b90d8
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2648526
> > Commit-Queue: Brian Sheedy <[email protected]>
> > Reviewed-by: Brian Sheedy <[email protected]>
> > Auto-Submit: Takuto Ikuta <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#847233}
>
> [email protected],[email protected],[email protected],[email protected]
>
> Change-Id: I14d6f5d027eb45c4092609a639c4aa32130fa2d1
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1127205
> Cq-Include-Trybots: luci.chromium.try:chromeos-kevin-rel
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2650928
> Reviewed-by: Ben Pastene <[email protected]>
> Commit-Queue: Ben Pastene <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#847332}
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 1127205
Change-Id: I3832b8c4378206542e8a0ea24e4f94acd97e4569
Cq-Include-Trybots: luci.chromium.try:chromeos-kevin-rel
Cq-Include-Trybots: luci.chrome.try:chromeos-eve-chrome
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2661120
Reviewed-by: Ben Pastene <[email protected]>
Reviewed-by: Brian Sheedy <[email protected]>
Commit-Queue: Brian Sheedy <[email protected]>
Auto-Submit: Takuto Ikuta <[email protected]>
Cr-Commit-Position: refs/heads/master@{#849174}
diff --git a/testing/trigger_scripts/base_test_triggerer.py b/testing/trigger_scripts/base_test_triggerer.py
index 0728e5e..8b18452a 100755
--- a/testing/trigger_scripts/base_test_triggerer.py
+++ b/testing/trigger_scripts/base_test_triggerer.py
@@ -36,25 +36,16 @@
def _convert_to_go_swarming_args(args):
go_args = []
- map_flags = {'--dimension', '--env', '--env-prefix', '--named-cache'}
i = 0
while i < len(args):
current_arg = args[i]
if current_arg == '--swarming':
current_arg = '--server'
- elif current_arg == '--resultdb':
- current_arg = '--enable-resultdb'
go_args.append(current_arg)
i += 1
- if current_arg in map_flags:
+ if current_arg == '--dimension':
go_args.append('{}={}'.format(args[i], args[i + 1]))
i += 2
- elif current_arg == '--cipd-package':
- # https://source.chromium.org/chromium/infra/infra/+/master:luci/client/swarming.py;l=1175-1177;drc=67e502dbf7a2a863c95e0d54fa486413d24d57a5
- path, name, version = args[i].split(':', 2)
- # https://source.chromium.org/chromium/infra/infra/+/master:go/src/go.chromium.org/luci/client/cmd/swarming/lib/trigger.go;l=458-465;drc=ef40d3f3503c2cc7bb0f3f6807b14a39bafb6ce4
- go_args.append('{}:{}={}'.format(path, name, version))
- i += 1
return go_args
@@ -94,7 +85,7 @@
respectively.
The arguments are structured like this:
- <args to swarming.py trigger> -- <args to bot running isolate>
+ <args to swarming trigger> -- <args to bot running isolate>
This means we have to add arguments to specific locations in the argument
list, to either affect the trigger command, or what the bot runs.
@@ -102,11 +93,9 @@
bot_args = ['--dump-json', temp_file]
if total_shards > 1:
bot_args.append('--env')
- bot_args.append('GTEST_SHARD_INDEX')
- bot_args.append(str(shard_index))
+ bot_args.append('GTEST_SHARD_INDEX=%s'%shard_index)
bot_args.append('--env')
- bot_args.append('GTEST_TOTAL_SHARDS')
- bot_args.append(str(total_shards))
+ bot_args.append('GTEST_TOTAL_SHARDS=%s'%total_shards)
if self._bot_configs:
for key, val in sorted(self._bot_configs[bot_index].iteritems()):
bot_args.append('--dimension')
