emulator: add "--dry-run" option for avd create

Bug: 922145
Change-Id: I08d3a9cc3dda9fe4673399c27d07a41d4eeadcc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2138791
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757534}

build/android/pylib/local/emulator/avd.py

@@ -183,7 +183,8 @@ class AvdConfig(object):
              force=False,
              snapshot=False,
              keep=False,
-             cipd_json_output=None):
+             cipd_json_output=None,
+             dry_run=False):
     """Create an instance of the AVD CIPD package.
 
     This method:
@@ -192,7 +193,8 @@ class AvdConfig(object):
      - modifies the AVD's ini files to support running chromium tests
        in chromium infrastructure
      - optionally starts & stops the AVD for snapshotting (default no)
-     - creates and uploads an instance of the AVD CIPD package
+     - By default creates and uploads an instance of the AVD CIPD package
+       (can be turned off by dry_run flag).
      - optionally deletes the AVD (default yes)
 
     Args:
@@ -202,6 +204,8 @@ class AvdConfig(object):
       keep: bool indicating whether to keep the AVD after creating
         the CIPD package.
       cipd_json_output: string path to pass to `cipd create` via -json-output.
+      dry_run: When set to True, it will skip the CIPD package creation
+        after creating the AVD.
     """
     logging.info('Installing required packages.')
     self._InstallCipdPackages(packages=[
@@ -309,13 +313,16 @@ class AvdConfig(object):
               '-json-output',
               cipd_json_output,
           ])
-        try:
-          for line in cmd_helper.IterCmdOutputLines(cipd_create_cmd):
-            logging.info('    %s', line)
-        except subprocess.CalledProcessError as e:
-          raise AvdException(
-              'CIPD package creation failed: %s' % str(e),
-              command=cipd_create_cmd)
+        if dry_run:
+          logging.info('Dry run. CIPD package creation skipped')
+        else:
+          try:
+            for line in cmd_helper.IterCmdOutputLines(cipd_create_cmd):
+              logging.info('    %s', line)
+          except subprocess.CalledProcessError as e:
+            raise AvdException(
+                'CIPD package creation failed: %s' % str(e),
+                command=cipd_create_cmd)
 
     finally:
       if not keep:

tools/android/avd/avd.py

@@ -69,11 +69,18 @@ def main(raw_args):
       metavar='PATH',
       help='Path to which `cipd create` should dump json output '
            'via -json-output.')
+  create_parser.add_argument(
+      '--dry-run',
+      action='store_true',
+      help='Skip the CIPD package creation after creating the AVD.')
 
   def create_cmd(args):
     avd.AvdConfig(args.avd_config).Create(
-        force=args.force, snapshot=args.snapshot, keep=args.keep,
-        cipd_json_output=args.cipd_json_output)
+        force=args.force,
+        snapshot=args.snapshot,
+        keep=args.keep,
+        cipd_json_output=args.cipd_json_output,
+        dry_run=args.dry_run)
     return 0
 
   create_parser.set_defaults(func=create_cmd)