Match BOM to get HWQual ID, write proper GBB, and do component test.

client/site_tests/suite_Factory/control

 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 AUTHOR = "Chrome OS Team"
 NAME = "Factory"
 TIME = "LONG"
 TEST_CATEGORY = "Functional"
@@ skipping 70 matching lines @@
         formal_name='step_runin',
         automated_seq=[
             # Match HWQual ID by running hardware_Components with ignored cids.
             factory.TestData(
                 label_en='hwqual id matching',
                 label_zw='型號匹配',
                 formal_name='hardware_Components',
                 dargs={'approved_dbs':'qualified_components*',
                        'ignored_cids':[
                            'hash_ro_firmware',
-                           'part_id_bios',
                            'part_id_hwqual',
+                           'vendor_id_bios',
                            'version_rw_firmware',
                        ]}),
             factory.TestData(
                 label_en='gpio switch check',
                 label_zw='檢查 gpio 開關',
                 formal_name='hardware_GPIOSwitches'),
             factory.TestData(
                 label_en='system stress',
                 label_zw='壓力測試',
                 formal_name='hardware_SAT',
@@ skipping 90 matching lines @@
         label_zw='還原模式',
         formal_name='factory_DeveloperRecovery',
         trigger='b',
         dargs={'layout':'devrec'}),
 
     # THIS IS A GOOGLE REQUIRED TEST.
     # PLEASE DO NOT REMOVE THIS TEST IN PRODUCTION RELEASES.
     factory.TestData(
         label_en='final',
         label_zw='最後測試',
-        formal_name='step_final',
+        formal_name='step_final_stage1',
         automated_seq=[
             # THIS IS A GOOGLE REQUIRED TEST.
             # PLEASE DO NOT REMOVE THIS TEST IN PRODUCTION RELEASES.
             factory.TestData(
+                label_en='write GBB',
+                label_zw='寫入GBB',
+                formal_name='factory_WriteGBB'),
+            factory.TestData(
+                label_en='reboot',
+                label_zw='重新開機',
+                formal_name='factory_RebootStub'),
+            factory.TestData(
                 label_en='component validation',
                 label_zw='元件驗證',
-                formal_name='hardware_Components',
-                dargs={'approved_dbs':'qualified_components*'})],
+                formal_name='hardware_Components')],
         trigger='f'),
 
     # THIS IS A GOOGLE REQUIRED TEST.
     # PLEASE DO NOT REMOVE THIS TEST IN PRODUCTION DEVICES.
     factory.TestData(
         label_en='wipe',
         label_zw='清除',
         formal_name='factory_Wipe',
         trigger='x',
         dargs={'secure_wipe':DO_FACTORY_SECURE_WIPE,
@@ skipping 21 matching lines @@
 ]
 
 for test in test_list:
     test.tag_prefix = test.trigger
     for subtest in test.automated_seq:
         subtest.tag_prefix = test.formal_name
 
 test_map = factory.make_test_map(test_list)
 trigger_set = factory.make_trigger_set(test_list)
 
-hwqual = None
 
 def run_subtest(name, dargs_map):
     job.run_test(name, **dargs_map[name])
 
 
 def step_reboot_seq(dargs_map, i=0):
     if i < _REBOOT_SEQ_ITERATIONS:
         job.next_step_prepend([step_reboot_seq, dargs_map, i + 1])
         factory.log('rebooting (iteration %d)' % i)
         time.sleep(5)
         job.reboot()
     else:
         run_subtest('factory_RebootStub', dargs_map)
         step_init()
 
 
+hwqual_id = None
+
+def get_hwqual_id():
+    # TODO: Move HWQual ID to StatusMap.
+    global hwqual_id
+    if not hwqual_id:
+        hwqual_id = find_hwqual_id()
+    return hwqual_id
+
+def find_hwqual_id():
+    cmd = ('find %s -name keyval | xargs grep -h ^hwqual_id= | '
+           'sed s/hwqual_id=// | head -1' %
+           (_RESULTS_PATH + '/hardware_Components.step_runin_*'))
+    hwqual_id = utils.system_output(cmd).strip()
+    hwqual_id = hwqual_id.rsplit(' ', 1)[0].replace(' ', '_')
+    if not hwqual_id:
+        factory.log('fail to get the HWQual ID')
+    return hwqual_id
+
+
+def update_dargs(test, dargs_map, update_map):
+    for (key, value) in update_map.iteritems():
+        dargs_map[test][key] = value
+
+
 def step_runin(ui, dargs_map):
     run_subtest('hardware_Components', dargs_map)
-    # Find the HWQual ID by getting the result of above hardware component test.
-    # TODO: Move this functionality to StatusMap.
-    cmd = ('find %s -name keyval | xargs grep -h ^hwqual_id= | '
-           'sed s/hwqual_id=// | head -1' %
-           (_RESULTS_PATH + '/hardware_Components.step_runin_*'))
-    hwqual = utils.system_output(cmd).strip()
-    if hwqual:
-        factory.log('HWQual ID = %s' % hwqual)
-    else:
-        factory.log('fail to get the HWQual ID')
-
     run_subtest('hardware_GPIOSwitches', dargs_map)
     job.drop_caches_between_iterations = True
     run_subtest('hardware_SAT', dargs_map)
     job.drop_caches_between_iterations = False
     run_subtest('graphics_GLBench', dargs_map)
     step_reboot_seq(dargs_map)
 
 
-def step_final(ui, dargs_map):
+def step_final_stage1(ui, dargs_map):
+    update_dargs('factory_WriteGBB', dargs_map,
+                 {'gbb_file': 'gbb_*%s' % get_hwqual_id()})
+    run_subtest('factory_WriteGBB', dargs_map)
+    job.next_step_prepend([step_final_stage2, ui, dargs_map])
+    factory.log('rebooting')
+    time.sleep(5)
+    job.reboot()
+
+
+def step_final_stage2(ui, dargs_map):
+    run_subtest('factory_RebootStub', dargs_map)
+    update_dargs('hardware_Components', dargs_map,
+                 {'approved_dbs': 'qualified_components_*%s' % get_hwqual_id()})
     run_subtest('hardware_Components', dargs_map)
+    step_init()
 
 
 def step_init():
     '''Launch the factory UI, which will then make decisions on which
     tests to run in which order.  This is to support user driven
     out-of-order test execution based on keyboard shortcuts.
 
     For each test, a trigger (possibly None) is communicated to the
     UI, which then replies with the test name and a count number that
     becomes the autotest tag to allow repeated test execution while
@@ skipping 44 matching lines @@
                 result = eval(file.readline())
 
         if result is not None:
             ui.send_cmd_switch_to(result)
         else:
             ui.send_cmd_next_test()
 
         test, test_count = ui.recv_target_test_update(test_map)
 
     factory.log('factory testing completed')