commit 60c5d33486b87a79dd385dbc8b7962b3ecfbda29
author Wei-Han Chen <stimim@google.com> Thu Jan 05 17:15:10 2017 +0800
committer Wei-Han Chen <stimim@chromium.org> Thu Jan 05 11:15:56 2017 +0000
tree fe436572a7b94dbb8a3b50e5a284aca8adf5ff7d
parent a65e7a549877fc90155c3e365b09b519c3e0fad5

gooftool: add skip list for finalize

Some checkpoints in finalization has side-effects, e.g. clear_gbb_flags.
We could only waive it (try it but ignore failure).
Now we can skip it entirely to prevent unwanted side-effects.

BUG=None
TEST=None

Change-Id: I0a3656569106e79655033ab05f05d1b91365b6f2
Reviewed-on: https://chromium-review.googlesource.com/425556
Reviewed-by: Wei-Han Chen <stimim@chromium.org>
Tested-by: Wei-Han Chen <stimim@chromium.org>

py/gooftool/commands.py

diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index 0e3c125..0d26c00 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -80,25 +80,29 @@
 
   This is similar to argparse_utils.Command, but all gooftool commands
   can be waived during `gooftool finalize` or `gooftool verify` using
-  --waive_list option.
+  --waive_list or --skip_list option.
   """
   def Decorate(fun):
-    def CommandWithWaiveCheck(options):
+    def CommandWithWaiveSkipCheck(options):
       waive_list = vars(options).get('waive_list', [])
-      if phase.GetPhase() >= phase.PVT_DOGFOOD and waive_list != []:
+      skip_list = vars(options).get('skip_list', [])
+      if phase.GetPhase() >= phase.PVT_DOGFOOD and (
+          waive_list != [] or skip_list != []):
         raise Error(
-            'waive_list should be empty for phase %s' % phase.GetPhase())
+            'waive_list and skip_list should be empty for phase %s' %
+            phase.GetPhase())
 
-      try:
-        fun(options)
-      except Exception as e:
-        if cmd_name in waive_list:
-          logging.exception(e)
-        else:
-          raise
+      if cmd_name not in skip_list:
+        try:
+          fun(options)
+        except Exception as e:
+          if cmd_name in waive_list:
+            logging.exception(e)
+          else:
+            raise
 
     return argparse_utils.Command(cmd_name, *args, **kwargs)(
-        CommandWithWaiveCheck)
+        CommandWithWaiveSkipCheck)
   return Decorate
 
 
@@ -184,6 +188,12 @@
          'Each item should be a sub-command of gooftool.'
          'e.g. "gooftool verify --waive_list verify_tpm clear_gbb_flags".')
 
+_skip_list_cmd_arg = CmdArg(
+    '--skip_list', nargs='*', default=[], metavar='SUBCMD',
+    help='A list of skipped checks, serperated by whitespace.'
+         'Each item should be a sub-command of gooftool.'
+         'e.g. "gooftool verify --skip_list verify_tpm clear_gbb_flags".')
+
 
 @Command('probe',
          CmdArg('--comps', nargs='*',
@@ -491,7 +501,8 @@
          _release_rootfs_cmd_arg,
          _firmware_path_cmd_arg,
          _enforced_release_channels_cmd_arg,
-         _waive_list_cmd_arg)
+         _waive_list_cmd_arg,
+         _skip_list_cmd_arg)
 def Verify(options):
   """Verifies if whole factory process is ready for finalization.
 
@@ -682,7 +693,8 @@
          _station_ip_cmd_arg,
          _station_port_cmd_arg,
          _wipe_finish_token_cmd_arg,
-         _waive_list_cmd_arg)
+         _waive_list_cmd_arg,
+         _skip_list_cmd_arg)
 def Finalize(options):
   """Verify system readiness and trigger transition into release state.