Cleanup NaCl SDK recipes

scripts/slave/recipes/client.nacl.sdk.recipe_autogen.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
     'chromium',
     'depot_tools/bot_update',
     'depot_tools/gclient',
     'file',
     'recipe_engine/json',
@@ skipping 44 matching lines @@
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout()
     build_properties.update(result.json.output.get("properties", {}))
 
     api.chromium.ensure_goma()
 
     # clobber before runhooks
     api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
 
-    # gclient runhooks wrapper step
+    # gclient runhooks step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
-    api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
-                                      "runhooks_wrapper.py"),
-               env=env)
+    api.chromium.runhooks(env=env)
 
     # generate_build_files step
     api.chromium.run_mb(api.properties.get('mastername'),
                         api.properties.get('buildername'))
 
     # cleanup_temp step
     api.chromium.cleanup_temp()
 
     # compile step
     api.chromium.compile(['chrome'])
 
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
-        args=
-        ['--build-properties=%s' % api.json.dumps(build_properties,
-                                                  separators=(',', ':')),
-         '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
-             ',"blink_config":"chromium",'+\
-             '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1",'+\
-             '"DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":'+\
-             '"fastbuild=1 component=static_library","LANDMINES_VERBOSE":"1"'+\
-             '},"no_gclient_branch":true,"nuke_and_pave":false}'
-         ],
         allow_subannotations=True)
 
 
 def mac_sdk_multi_steps(api):
     build_properties = api.properties.legacy()
     # update scripts step; implicitly run by recipe engine.
     # bot_update step
     src_cfg = api.gclient.make_config()
     soln = src_cfg.solutions.add()
     soln.name = "src"
@@ skipping 31 matching lines @@
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout()
     build_properties.update(result.json.output.get("properties", {}))
 
     api.chromium.ensure_goma()
 
     # clobber before runhooks
     api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
 
-    # gclient runhooks wrapper step
+    # gclient runhooks step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library',
            'LANDMINES_VERBOSE': '1'}
-    api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
-                                      "runhooks_wrapper.py"),
-               env=env)
+    api.chromium.runhooks(env=env)
 
     # generate_build_files step
     api.chromium.run_mb(api.properties.get('mastername'),
                         api.properties.get('buildername'))
 
     # cleanup_temp step
     api.chromium.cleanup_temp()
 
     # compile step
     api.chromium.compile(['chrome'])
 
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
-        args=
-        ['--build-properties=%s' % api.json.dumps(build_properties,
-                                                  separators=(',', ':')),
-         '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
-             ',"blink_config":"chromium","gclient_env":'+\
-             '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
-             '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
-             '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\
-             '"no_gclient_branch":true,"nuke_and_pave":false}'
-         ],
         allow_subannotations=True)
 
 
 def windows_sdk_multi_steps(api):
     build_properties = api.properties.legacy()
     # taskkill step
     api.python("taskkill", api.path["build"].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config()
@@ skipping 32 matching lines @@
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout()
     build_properties.update(result.json.output.get("properties", {}))
 
     api.chromium.ensure_goma()
 
     # clobber before runhooks
     api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
 
-    # gclient runhooks wrapper step
+    # gclient runhooks step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
-    api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
-                                      "runhooks_wrapper.py"),
-               env=env)
+    api.chromium.runhooks(env=env)
 
     # generate_build_files step
     api.chromium.run_mb(api.properties.get('mastername'),
                         api.properties.get('buildername'))
 
     # cleanup_temp step
     api.chromium.cleanup_temp()
 
     # compile step
     api.chromium.compile(['chrome'])
 
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
-        args=
-        ['--build-properties=%s' % api.json.dumps(build_properties,
-                                                  separators=(',', ':')),
-         '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
-             ',"blink_config":"chromium","gclient_env":'+\
-             '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
-             '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
-             '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\
-             '"nuke_and_pave":false}'
-         ],
         allow_subannotations=True)
 
 
 def linux_sdk_multirel_steps(api):
     build_properties = api.properties.legacy()
     # update scripts step; implicitly run by recipe engine.
     # bot_update step
     src_cfg = api.gclient.make_config()
     soln = src_cfg.solutions.add()
     soln.name = "chrome-official"
     soln.url = "svn://svn.chromium.org/chrome-internal/trunk/tools/buildspec/"+\
         "build/chrome-official"
     soln.custom_deps = {'src-pdf': None, 'src/pdf': None}
     src_cfg.got_revision_mapping.update(
         {'src': 'got_revision',
          'src/third_party/WebKit': 'got_webkit_revision',
          'src/tools/swarming_client': 'got_swarming_client_revision',
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout()
     build_properties.update(result.json.output.get("properties", {}))
 
     api.chromium.ensure_goma()
 
     # clobber before runhooks
     api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
 
-    # gclient runhooks wrapper step
+    # gclient runhooks step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
-    api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
-                                      "runhooks_wrapper.py"),
-               env=env)
+    api.chromium.runhooks(env=env)
 
     # generate_build_files step
     api.chromium.run_mb(api.properties.get('mastername'),
                         api.properties.get('buildername'))
 
     # cleanup_temp step
     api.chromium.cleanup_temp()
 
     # compile step
     api.chromium.compile(['chrome'])
 
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
-        args=
-        ['--build-properties=%s' % api.json.dumps(build_properties,
-                                                  separators=(',', ':')),
-         '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
-             ',"blink_config":"chromium","gclient_env":'+\
-             '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
-             '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
-             '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\
-             '"nuke_and_pave":true}'
-         ],
         allow_subannotations=True)
 
 
 def windows_sdk_multirel_steps(api):
     build_properties = api.properties.legacy()
     # taskkill step
     api.python("taskkill", api.path["build"].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config()
     soln = src_cfg.solutions.add()
     soln.name = "chrome-official"
     soln.url = "svn://svn.chromium.org/chrome-internal/trunk/tools/buildspec/"+\
         "build/chrome-official"
     soln.custom_deps = {'src-pdf': None, 'src/pdf': None}
     src_cfg.got_revision_mapping.update(
         {'src': 'got_revision',
          'src/third_party/WebKit': 'got_webkit_revision',
          'src/tools/swarming_client': 'got_swarming_client_revision',
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout()
     build_properties.update(result.json.output.get("properties", {}))
 
     api.chromium.ensure_goma()
 
     # clobber before runhooks
     api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
 
-    # gclient runhooks wrapper step
+    # gclient runhooks step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
-    api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
-                                      "runhooks_wrapper.py"),
-               env=env)
+    api.chromium.runhooks(env=env)
 
     # generate_build_files step
     api.chromium.run_mb(api.properties.get('mastername'),
                         api.properties.get('buildername'))
 
     # cleanup_temp step
     api.chromium.cleanup_temp()
 
     # compile step
     api.chromium.compile(['chrome'])
 
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
-        args=
-        ['--build-properties=%s' % api.json.dumps(build_properties,
-                                                  separators=(',', ':')),
-         '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
-             ',"blink_config":"chromium","gclient_env":'+\
-             '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
-             '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
-             '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\
-             '"nuke_and_pave":true}'
-         ],
         allow_subannotations=True)
 
 
 def mac_sdk_multirel_steps(api):
     build_properties = api.properties.legacy()
     # update scripts step; implicitly run by recipe engine.
     # bot_update step
     src_cfg = api.gclient.make_config()
     soln = src_cfg.solutions.add()
     soln.name = "chrome-official"
     soln.url = "svn://svn.chromium.org/chrome-internal/trunk/tools/buildspec/"+\
         "build/chrome-official"
     soln.custom_deps = {'src-pdf': None, 'src/pdf': None}
     src_cfg.got_revision_mapping.update(
         {'src': 'got_revision',
          'src/third_party/WebKit': 'got_webkit_revision',
          'src/tools/swarming_client': 'got_swarming_client_revision',
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout()
     build_properties.update(result.json.output.get("properties", {}))
 
     api.chromium.ensure_goma()
 
     # clobber before runhooks
     api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
 
-    # gclient runhooks wrapper step
+    # gclient runhooks step
     env = {'LANDMINES_VERBOSE': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library',
            'CHROMIUM_GYP_SYNTAX_CHECK': '1'}
-    api.python("gclient runhooks wrapper",
-               api.path["build"].join("scripts", "slave",
-                                      "runhooks_wrapper.py"),
-               env=env)
+    api.chromium.runhooks(env=env)
 
     # generate_build_files step
     api.chromium.run_mb(api.properties.get('mastername'),
                         api.properties.get('buildername'))
 
     # cleanup_temp step
     api.chromium.cleanup_temp()
 
     # compile step
     api.chromium.compile(['chrome'])
 
     # annotated_steps step
     api.python(
         "annotated_steps",
         api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
-        args=
-        ['--build-properties=%s' % api.json.dumps(build_properties,
-                                                  separators=(',', ':')),
-         '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
-             ',"blink_config":"chromium","gclient_env":'+\
-             '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
-             '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
-             '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\
-             '"no_gclient_branch":true,"nuke_and_pave":true}'
-         ],
         allow_subannotations=True)
 
 
 dispatch_directory = {
     'linux-sdk-multi': linux_sdk_multi_steps,
     'mac-sdk-multi': mac_sdk_multi_steps,
     'windows-sdk-multi': windows_sdk_multi_steps,
     'linux-sdk-multirel': linux_sdk_multirel_steps,
     'linux-sdk-asan-multi': linux_sdk_multi_steps,
     'windows-sdk-multirel': windows_sdk_multirel_steps,
@@ skipping 49 matching lines @@
     yield (api.test('mac_sdk_multirel') + api.properties(
         mastername='client.nacl.sdk') + api.properties(
             buildername='mac-sdk-multirel') +
            api.properties(revision='123456789abcdef') + api.properties(
                got_revision='123456789abcdef') + api.properties(
                    buildnumber='42') + api.properties(slavename='TestSlave'))
     yield (api.test('builder_not_in_dispatch_directory') + api.properties(
         mastername='client.nacl.sdk') + api.properties(
             buildername='nonexistent_builder') + api.properties(
                 slavename='TestSlave'))