Fix custom cros hw swarming trigger script. And make it hopefully fut…

…ure-proof.

It broke again after https://chromium-review.googlesource.com/c/chromium/tools/build/+/1501474

This should make it immune to future relands + reverts of the same change.

Bug: 926987, 938211
Change-Id: I99654cc71b1c8a83fdd29defc20b1e35cddb3fae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1504039
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637863}

testing/trigger_scripts/chromeos_device_trigger.py

@@ -69,11 +69,16 @@ def parse_args(triggerer):
       help='How long to wait (in seconds) for an available bot in the primary '
            'task slice.')
   # BaseTestTriggerer's setup_parser_contract() takes care of adding needed
-  # swarming.py args if they're not already present.
-  base_test_triggerer.BaseTestTriggerer.setup_parser_contract(parser)
-  args, additional_args = parser.parse_known_args()
-  additional_args = triggerer.modify_args(
-      additional_args, 0, args.shard_index, args.shards, args.dump_json)
+  # swarming.py args if they're not already present. But only do this if
+  # '--shard-index' is passed in. (The exact usage of trigger scripts are
+  # currently changing. See crbug.com/926987 for more info.)
+  if '--shard-index' in sys.argv:
+    base_test_triggerer.BaseTestTriggerer.setup_parser_contract(parser)
+    args, additional_args = parser.parse_known_args()
+    additional_args = triggerer.modify_args(
+        additional_args, 0, args.shard_index, args.shards, args.dump_json)
+  else:
+    args, additional_args = parser.parse_known_args()
 
   if additional_args[0] != 'trigger':
     parser.error(