scripts/slave/recipes/client.dynamorio.recipe_autogen.py - Issue 2319853002: Remove ignored bot_update "force" parameter.

Unified Diff: scripts/slave/recipes/client.dynamorio.recipe_autogen.py

Issue 2319853002: Remove ignored bot_update "force" parameter. (Closed)

Patch Set: rebase Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json ('k') | scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/client.dynamorio.recipe_autogen.py

diff --git a/scripts/slave/recipes/client.dynamorio.recipe_autogen.py b/scripts/slave/recipes/client.dynamorio.recipe_autogen.py

index 4e5f6a065987113d49ec8f7736ffed0209d63ea2..939ea7bd323b8cf45484223d91a2ebfdf0d3a905 100644

--- a/scripts/slave/recipes/client.dynamorio.recipe_autogen.py

+++ b/scripts/slave/recipes/client.dynamorio.recipe_autogen.py

@@ -21,7 +21,7 @@ def win_xp_dr_nightly_steps(api):

soln.custom_deps = {'dynamorio/tools/buildbot':

'https://github.com/DynamoRIO/buildbot.git'}

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# unpack tools step; generic ShellCommand converted

api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',

@@ -45,7 +45,7 @@ def linux_dr_steps(api):

soln.name = "dynamorio"

soln.url = "https://github.com/DynamoRIO/dynamorio.git"

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# pre-commit suite step

api.step("pre-commit suite", ['ctest', '--timeout', '120', '-VV', '-S',

@@ -66,7 +66,7 @@ def win_7_dr_steps(api):

soln.custom_deps = {'dynamorio/tools/buildbot':

'https://github.com/DynamoRIO/buildbot.git'}

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# unpack tools step; generic ShellCommand converted

api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',

@@ -88,7 +88,7 @@ def linux_dr_package_steps(api):

soln.name = "dynamorio"

soln.url = "https://github.com/DynamoRIO/dynamorio.git"

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# get buildnumber step; no longer needed

# Package DynamoRIO step

@@ -112,7 +112,7 @@ def win_8_dr_steps(api):

soln.custom_deps = {'dynamorio/tools/buildbot':

'https://github.com/DynamoRIO/buildbot.git'}

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# unpack tools step; generic ShellCommand converted

api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',

@@ -137,7 +137,7 @@ def win_xp_dr_steps(api):

soln.custom_deps = {'dynamorio/tools/buildbot':

'https://github.com/DynamoRIO/buildbot.git'}

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# unpack tools step; generic ShellCommand converted

api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',

@@ -161,7 +161,7 @@ def win_7_dr_nightly_steps(api):

soln.custom_deps = {'dynamorio/tools/buildbot':

'https://github.com/DynamoRIO/buildbot.git'}

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# unpack tools step; generic ShellCommand converted

api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',

@@ -186,7 +186,7 @@ def win_8_dr_nightly_steps(api):

soln.custom_deps = {'dynamorio/tools/buildbot':

'https://github.com/DynamoRIO/buildbot.git'}

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# unpack tools step; generic ShellCommand converted

api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',

@@ -211,7 +211,7 @@ def win_dr_package_steps(api):

soln.custom_deps = {'dynamorio/tools/buildbot':

'https://github.com/DynamoRIO/buildbot.git'}

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# unpack tools step; generic ShellCommand converted

api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',

@@ -240,7 +240,7 @@ def linux_dr_nightly_steps(api):

soln.name = "dynamorio"

soln.url = "https://github.com/DynamoRIO/dynamorio.git"

api.gclient.c = src_cfg

- result = api.bot_update.ensure_checkout(force=True)

+ result = api.bot_update.ensure_checkout()

build_properties.update(result.json.output.get("properties", {}))

# dynamorio nightly suite step

api.step("nightly suite", ["ctest", "--timeout", "120", "-VV", "-S",