Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (fuchsia) into this repository.
The build that created this CL was
https://ci.chromium.org/b/8748593999132960833
Please review the expectation changes, and LGTM+CQ.
fuchsia:
https://fuchsia.googlesource.com/infra/recipes/+/16132806c80ea9eaab16c80c352605f9a0e61a71
1613280 (mohrr@google.com)
[macos_sdk] Add timeout
Please check the following references for more information:
- autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller
- rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback
- cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md
Use https://goo.gl/noib3a to file a bug.
R=mohrr@google.com, tpudlik@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Ignore-Freeze: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ia8fec1844e59238edb351798c827f5eaf44cc86f
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/208751
Commit-Queue: Rob Mohr <mohrr@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Reviewed-by: Rob Mohr <mohrr@google.com>
Commit-Queue: Recipe Deps Roller <recipe-deps-roller@pigweed-service-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 2a6ecca..5f5c2f8 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -17,7 +17,7 @@
"deps": {
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "f9615a6f1b32e3f441463217f61c55b0a7e7ae00",
+ "revision": "16132806c80ea9eaab16c80c352605f9a0e61a71",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index b6cf0a1..01fbfd9 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -91,6 +91,12 @@
"[START_DIR]/cipd_tool/infra/tools/mac_toolchain/be1bf3cbb34d603837500595770868faf18232f9529e0a375b9527506d4cd711"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001201.5
+ }
+ },
"name": "environment.setup platform.ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
@@ -110,6 +116,12 @@
"/path/to/tmp/json"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001201.5
+ }
+ },
"name": "environment.setup platform.ensure XCode 14e222b.install infra/tools/mac_toolchain.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
@@ -138,6 +150,12 @@
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001201.5
+ }
+ },
"name": "environment.setup platform.ensure XCode 14e222b.install XCode 14e222b",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -151,6 +169,12 @@
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001201.5
+ }
+ },
"name": "environment.setup platform.ensure XCode 14e222b.select XCode 14e222b",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -164,6 +188,12 @@
"--show-sdk-path"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001201.5
+ }
+ },
"name": "environment.setup platform.ensure XCode 14e222b.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
@@ -243,6 +273,12 @@
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001203.0
+ }
+ },
"name": "environment.run pw_env_setup.ensure XCode 14e222b.select XCode 14e222b",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -256,6 +292,12 @@
"--show-sdk-path"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001203.0
+ }
+ },
"name": "environment.run pw_env_setup.ensure XCode 14e222b.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
@@ -317,7 +359,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000013.0
+ "soft_deadline": 1337000016.0
}
},
"name": "environment.run pw_env_setup.pw_env_setup",
@@ -385,7 +427,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000034.5
+ "soft_deadline": 1337000037.5
}
},
"name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
@@ -410,7 +452,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000036.0
+ "soft_deadline": 1337000039.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
@@ -435,7 +477,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000037.5
+ "soft_deadline": 1337000040.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
@@ -460,7 +502,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000039.0
+ "soft_deadline": 1337000042.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.bat",
@@ -485,7 +527,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000040.5
+ "soft_deadline": 1337000043.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.compdb",
@@ -510,7 +552,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000042.0
+ "soft_deadline": 1337000045.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.gn",
@@ -535,7 +577,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000043.5
+ "soft_deadline": 1337000046.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.graph",
@@ -560,7 +602,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000045.0
+ "soft_deadline": 1337000048.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.json",
@@ -585,7 +627,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000046.5
+ "soft_deadline": 1337000049.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.log",
@@ -617,7 +659,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000048.0
+ "soft_deadline": 1337000051.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.sh",
@@ -642,7 +684,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000049.5
+ "soft_deadline": 1337000052.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stderr",
@@ -667,7 +709,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000051.0
+ "soft_deadline": 1337000054.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stdout",
@@ -692,7 +734,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000052.5
+ "soft_deadline": 1337000055.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.txt",
@@ -717,7 +759,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000057.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.cfg",
@@ -742,7 +784,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000058.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.ensure",
@@ -767,7 +809,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000057.0
+ "soft_deadline": 1337000060.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.json",
@@ -792,7 +834,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000061.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.log",
@@ -817,7 +859,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000063.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.txt",
@@ -842,7 +884,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000064.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*_log",
@@ -867,7 +909,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000066.0
}
},
"name": "environment.run pw_env_setup.logs.glob.pigweed_environment.gni",
@@ -892,7 +934,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000067.5
}
},
"name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
@@ -1114,6 +1156,12 @@
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001239.0
+ }
+ },
"name": "environment.ensure XCode 14e222b.select XCode 14e222b",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
@@ -1127,6 +1175,12 @@
"--show-sdk-path"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001239.0
+ }
+ },
"name": "environment.ensure XCode 14e222b.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
@@ -1203,6 +1257,12 @@
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001240.5
+ }
+ },
"name": "ensure XCode 14e222b.select XCode 14e222b",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -1216,6 +1276,12 @@
"--show-sdk-path"
],
"infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337001240.5
+ }
+ },
"name": "ensure XCode 14e222b.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
