Commit 350d2108 authored by Junji Watanabe's avatar Junji Watanabe Committed by LUCI CQ

Revert .cipd_bin setup in depot_tools recipe module

This reverts https://crrev.com/c/3697958 and https://crrev.com/c/3704921.
One reason is that recipe bundle is not designed to be mutated.
Another reason is the presence of gomacc binary under .cipd_bin causes an unexpected side effect. https://crbug.com/1337048

Bug: 931218, 1337048
Recipe-Nontrivial-Roll: build_limited
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: chrome_release
Recipe-Nontrivial-Roll: chromiumos
Recipe-Nontrivial-Roll: infra
Change-Id: Iaea12a0ad9246c0781035aa499cc6c0bb42d71c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3715873
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: 's avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: 's avatarJosip Sokcevic <sokcevic@google.com>
parent 28190a2f
......@@ -128,7 +128,7 @@ the depot_tools repo.
#### **class [DepotToolsApi](/recipes/recipe_modules/depot_tools/api.py#12)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
&emsp; **@property**<br>&mdash; **def [autoninja\_path](/recipes/recipe_modules/depot_tools/api.py#50)(self):**
&emsp; **@property**<br>&mdash; **def [autoninja\_path](/recipes/recipe_modules/depot_tools/api.py#49)(self):**
&emsp; **@property**<br>&mdash; **def [cros\_path](/recipes/recipe_modules/depot_tools/api.py#30)(self):**
......@@ -140,7 +140,7 @@ the depot_tools repo.
&emsp; **@property**<br>&mdash; **def [ninja\_path](/recipes/recipe_modules/depot_tools/api.py#44)(self):**
&emsp; **@contextlib.contextmanager**<br>&mdash; **def [on\_path](/recipes/recipe_modules/depot_tools/api.py#60)(self):**
&emsp; **@contextlib.contextmanager**<br>&mdash; **def [on\_path](/recipes/recipe_modules/depot_tools/api.py#58)(self):**
Use this context manager to put depot_tools on $PATH.
......@@ -151,7 +151,7 @@ with api.depot_tools.on_path():
# run some steps
```
&emsp; **@property**<br>&mdash; **def [presubmit\_support\_py\_path](/recipes/recipe_modules/depot_tools/api.py#56)(self):**
&emsp; **@property**<br>&mdash; **def [presubmit\_support\_py\_path](/recipes/recipe_modules/depot_tools/api.py#54)(self):**
&emsp; **@property**<br>&mdash; **def [root](/recipes/recipe_modules/depot_tools/api.py#25)(self):**
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": ":"
},
"resultdb": {
"current_invocation": {
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:ci"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -53,44 +53,6 @@
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"luci_context": {
"realm": {
"name": "chromium/src:try"
},
"resultdb": {
"current_invocation": {
"name": "invocations/build:8945511751514863184",
"update_token": "token"
},
"hostname": "rdbhost"
}
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython3",
......
......@@ -43,13 +43,11 @@ class DepotToolsApi(recipe_api.RecipeApi):
@property
def ninja_path(self):
self._cipd_bin_setup()
ninja_exe = 'ninja.exe' if self.m.platform.is_win else 'ninja'
return self.repo_resource(ninja_exe)
@property
def autoninja_path(self):
self._cipd_bin_setup()
autoninja = 'autoninja.bat' if self.m.platform.is_win else 'autoninja'
return self.repo_resource(autoninja)
......@@ -70,20 +68,9 @@ class DepotToolsApi(recipe_api.RecipeApi):
"""
# By default Depot Tools do not auto update on the bots.
# (crbug/1090603)
self._cipd_bin_setup()
with self.m.context(
**{'env_suffixes': {
'PATH': [self.root],
'DEPOT_TOOLS_UPDATE': '0'
}}):
yield
def _cipd_bin_setup(self):
"""Installs CIPD packages under .cipd_bin."""
if self._cipd_bin_setup_called:
return
self.m.cipd.ensure(
self.repo_resource('.cipd_bin'),
self.repo_resource('cipd_manifest.txt'),
'ensure depot_tools/.cipd_bin')
self._cipd_bin_setup_called = True
......@@ -41,27 +41,6 @@
],
"name": "gsutil_py_path"
},
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"ls",
......
......@@ -41,27 +41,6 @@
],
"name": "gsutil_py_path"
},
{
"cmd": [
"cipd.bat",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]\\.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]\\cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"ls",
......
[
{
"cmd": [
"cipd",
"ensure",
"-root",
"RECIPE_REPO[depot_tools]/.cipd_bin",
"-ensure-file",
"RECIPE_REPO[depot_tools]/cipd_manifest.txt",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"name": "ensure depot_tools/.cipd_bin",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"vpython",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment