Use CAS in scripts/trigger.py

Isolate server is being migrated to CAS. This CL changes trigger.py to use CAS instead of Isolate server. Bug: chromium:1163817 Change-Id: I137cd656798c08bf991cb77da36780b87193f821 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2626931Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Use CAS in scripts/trigger.py
f7801a3b · Junji Watanabe · Commit Bot · 9a39b7b3 · f7801a3b
Commit f7801a3b authored Jan 13, 2021 by Junji Watanabe Committed by Commit Bot Jan 13, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 9 deletions

trigger.py scripts/trigger.py +8 -9

No files found.
--- a/scripts/trigger.py
+++ b/scripts/trigger.py
@@ -72,24 +72,23 @@ def main():
    isolate_cmd_path = os.path.join('tools', 'luci-go', 'isolate')
    isolate_file = os.path.join(out_file_path, '%s.isolate' % args.test)
-    isolated_file = os.path.join(out_file_path, '%s.isolated' % args.test)
+    archive_file = os.path.join(out_file_path, '%s.archive.json' % args.test)
    isolate_args = [
-        isolate_cmd_path, 'archive', '-I', 'https://isolateserver.appspot.com', '-i', isolate_file,
+        isolate_cmd_path, 'archive', '-i', isolate_file, '-cas-instance', 'chromium-swarm',
-        '-s', isolated_file
+        '-dump-json', archive_file
    ]
    logging.info('Invoking isolate: %s' % ' '.join(isolate_args))
    subprocess.check_call(isolate_args)
-    with open(isolated_file, 'rb') as f:
+    with open(archive_file) as f:
-        sha = hashlib.sha1(f.read()).hexdigest()
+        digest = json.load(f).get(args.test)
-    logging.info('Got an isolated SHA of %s' % sha)
+    logging.info('Got an CAS digest %s' % digest)
    swarming_script_path = os.path.join('tools', 'luci-go', 'swarming')
    swarming_args = [
-        swarming_script_path, 'trigger', '-S', 'chromium-swarm.appspot.com', '-I',
+        swarming_script_path, 'trigger', '-S', 'chromium-swarm.appspot.com', '-d',
-        'https://isolateserver.appspot.com', '-d', 'os=' + args.os_dim, '-d', 'pool=' + args.pool,
+        'os=' + args.os_dim, '-d', 'pool=' + args.pool, '-digest', digest
-        '-s', sha
    ]
    # Set priority. Don't abuse this!