[CP] Update cocoon cipd packages path
* https://flutter-review.googlesource.com/c/recipes/+/48700
* https://flutter-review.googlesource.com/c/recipes/+/48740
Manually copy of the following CLs due to conflicts
Bug: https://github.com/flutter/flutter/issues/132676
Change-Id: Ib0033219747e8214c439088b6515a364f358597f
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/49583
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Casey Hillers <chillers@google.com>
diff --git a/recipe_modules/os_utils/api.py b/recipe_modules/os_utils/api.py
index 6e6955c..7ba961f 100644
--- a/recipe_modules/os_utils/api.py
+++ b/recipe_modules/os_utils/api.py
@@ -238,6 +238,7 @@
with self.m.step.nest('ios_debug_symbol_doctor'):
cocoon_path = self._checkout_cocoon()
entrypoint = cocoon_path.join(
+ 'cipd_packages',
'device_doctor',
'bin',
'ios_debug_symbol_doctor.dart',
@@ -250,7 +251,7 @@
# Since we double the timeout on each retry, the last retry will have a
# timeout of 16 minutes
retry_count = 4
- with self.m.context(cwd=cocoon_path.join('device_doctor'),
+ with self.m.context(cwd=cocoon_path.join('cipd_packages', 'device_doctor'),
infra_steps=True):
self.m.step(
'pub get device_doctor',
@@ -295,7 +296,8 @@
infra_step=True,
)
with self.m.context(
- cwd=cocoon_path.join('device_doctor', 'tool', 'infra-dialog'),
+ cwd=cocoon_path.join('cipd_packages', 'device_doctor', 'tool',
+ 'infra-dialog'),
infra_steps=True,
):
device_id = self.m.step(
diff --git a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
index 985a937..4e0de01 100644
--- a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
+++ b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
@@ -123,7 +123,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.pub get device_doctor",
"~followup_annotations": [
@@ -133,10 +133,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.diagnose",
"~followup_annotations": [
@@ -433,7 +433,7 @@
"idevice_id",
"-l"
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"infra_step": true,
"name": "Dismiss dialogs.Find device id",
"~followup_annotations": [
@@ -445,7 +445,7 @@
"RECIPE_MODULE[flutter::os_utils]/resources/dismiss_dialogs.sh",
""
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"infra_step": true,
"name": "Dismiss dialogs.Run app to dismiss dialogs",
"~followup_annotations": [
diff --git a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json
index 7147cc0..a48625c 100644
--- a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json
+++ b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json
@@ -126,7 +126,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.pub get device_doctor",
"~followup_annotations": [
@@ -136,10 +136,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.diagnose",
"~followup_annotations": [
@@ -150,14 +150,14 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
"--timeout",
"120"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.recover with 120 second timeout",
"~followup_annotations": [
@@ -167,10 +167,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.diagnose (2)",
"~followup_annotations": [
@@ -181,14 +181,14 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
"--timeout",
"240"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.recover with 240 second timeout",
"~followup_annotations": [
@@ -198,10 +198,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.diagnose (3)",
"~followup_annotations": [
@@ -212,14 +212,14 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
"--timeout",
"480"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.recover with 480 second timeout",
"~followup_annotations": [
@@ -229,10 +229,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.diagnose (4)",
"~followup_annotations": [
@@ -243,14 +243,14 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
"--timeout",
"960"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.recover with 960 second timeout",
"~followup_annotations": [
diff --git a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json
index 1802d19..3f03cbe 100644
--- a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json
+++ b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json
@@ -126,7 +126,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.pub get device_doctor",
"~followup_annotations": [
@@ -136,10 +136,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.diagnose",
"~followup_annotations": [
@@ -150,14 +150,14 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
"--timeout",
"120"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.recover with 120 second timeout",
"~followup_annotations": [
@@ -167,10 +167,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"infra_step": true,
"name": "ios_debug_symbol_doctor.diagnose (2)",
"~followup_annotations": [
@@ -467,7 +467,7 @@
"idevice_id",
"-l"
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"infra_step": true,
"name": "Dismiss dialogs.Find device id",
"~followup_annotations": [
@@ -479,7 +479,7 @@
"RECIPE_MODULE[flutter::os_utils]/resources/dismiss_dialogs.sh",
""
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"infra_step": true,
"name": "Dismiss dialogs.Run app to dismiss dialogs",
"~followup_annotations": [
diff --git a/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json b/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json
index 6cb1deb..4f933aa 100644
--- a/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json
+++ b/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json
@@ -199,7 +199,7 @@
"bash",
"[START_DIR]/cocoon/codesign/tool/build.sh"
],
- "cwd": "[START_DIR]/cocoon/codesign",
+ "cwd": "[START_DIR]/cocoon/cipd_packages/codesign",
"luci_context": {
"realm": {
"name": "project:try"
@@ -219,7 +219,7 @@
"cipd",
"pkg-build",
"-in",
- "[START_DIR]/cocoon/codesign/build",
+ "[START_DIR]/cocoon/cipd_packages/codesign/build",
"-name",
"flutter/codesign/mac-amd64",
"-out",
@@ -229,7 +229,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[START_DIR]/cocoon/codesign",
+ "cwd": "[START_DIR]/cocoon/cipd_packages/codesign",
"luci_context": {
"realm": {
"name": "project:try"
diff --git a/recipes/cocoon/cipd.expected/cipd_win_upload.json b/recipes/cocoon/cipd.expected/cipd_win_upload.json
index bbe0741..65b4901 100644
--- a/recipes/cocoon/cipd.expected/cipd_win_upload.json
+++ b/recipes/cocoon/cipd.expected/cipd_win_upload.json
@@ -198,7 +198,7 @@
"cmd": [
"[START_DIR]\\cocoon\\device_doctor\\tool\\build.bat"
],
- "cwd": "[START_DIR]\\cocoon\\device_doctor",
+ "cwd": "[START_DIR]\\cocoon\\cipd_packages\\device_doctor",
"luci_context": {
"realm": {
"name": "project:prod"
@@ -218,7 +218,7 @@
"cipd.bat",
"pkg-build",
"-in",
- "[START_DIR]\\cocoon\\device_doctor\\build",
+ "[START_DIR]\\cocoon\\cipd_packages\\device_doctor\\build",
"-name",
"flutter/device_doctor/windows-amd64",
"-out",
@@ -228,7 +228,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[START_DIR]\\cocoon\\device_doctor",
+ "cwd": "[START_DIR]\\cocoon\\cipd_packages\\device_doctor",
"luci_context": {
"realm": {
"name": "project:prod"
@@ -262,7 +262,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[START_DIR]\\cocoon\\device_doctor",
+ "cwd": "[START_DIR]\\cocoon\\cipd_packages\\device_doctor",
"luci_context": {
"realm": {
"name": "project:prod"
diff --git a/recipes/cocoon/cipd.py b/recipes/cocoon/cipd.py
index c960e0a..d988bef 100644
--- a/recipes/cocoon/cipd.py
+++ b/recipes/cocoon/cipd.py
@@ -46,7 +46,7 @@
script_path_list = api.properties.get('script')
cipd_full_name = api.properties.get('cipd_name')
project_name = cipd_full_name.split('/')[1]
- project_path = cocoon_dir.join(project_name)
+ project_path = cocoon_dir.join('cipd_packages', project_name)
build_file = cocoon_dir.join(script_path_list)
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
index 37dcedd..814ff21 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
@@ -1247,7 +1247,7 @@
"idevice_id",
"-l"
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1291,7 +1291,7 @@
"RECIPE_MODULE[flutter::os_utils]/resources/dismiss_dialogs.sh",
""
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1773,7 +1773,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1815,10 +1815,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 4f3a060..d463473 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -1247,7 +1247,7 @@
"idevice_id",
"-l"
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1291,7 +1291,7 @@
"RECIPE_MODULE[flutter::os_utils]/resources/dismiss_dialogs.sh",
""
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1773,7 +1773,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1815,10 +1815,10 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
