Update cocoon cipd packages path
Change-Id: If3b2821c0e729695e0c507427351f50c1eecc193
Bug: https://github.com/flutter/flutter/issues/132070
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/48700
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Reviewed-by: Drew Roen <drewroen@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/recipe_modules/os_utils/api.py b/recipe_modules/os_utils/api.py
index 5ea7bf5..9dc1ff3 100644
--- a/recipe_modules/os_utils/api.py
+++ b/recipe_modules/os_utils/api.py
@@ -260,7 +260,8 @@
# 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',
@@ -314,7 +315,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..5388f40 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": [
@@ -136,7 +136,7 @@
"[CACHE]/cocoon/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 1a4aaa8..a6601c2 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": [
@@ -139,7 +139,7 @@
"[CACHE]/cocoon/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": [
@@ -157,7 +157,7 @@
"--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": [
@@ -170,7 +170,7 @@
"[CACHE]/cocoon/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": [
@@ -188,7 +188,7 @@
"--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": [
@@ -201,7 +201,7 @@
"[CACHE]/cocoon/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": [
@@ -219,7 +219,7 @@
"--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": [
@@ -232,7 +232,7 @@
"[CACHE]/cocoon/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": [
@@ -250,7 +250,7 @@
"--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": [
@@ -263,7 +263,7 @@
"[CACHE]/cocoon/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 (5)",
"~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..15e6112 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": [
@@ -139,7 +139,7 @@
"[CACHE]/cocoon/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": [
@@ -157,7 +157,7 @@
"--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": [
@@ -170,7 +170,7 @@
"[CACHE]/cocoon/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.py b/recipes/cocoon/cipd.py
index 776bb0b..99210a1 100644
--- a/recipes/cocoon/cipd.py
+++ b/recipes/cocoon/cipd.py
@@ -46,9 +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)
- if not api.path.exists(project_path):
- project_path = cocoon_dir.join('cipd_packages').join(project_name)
+ project_path = cocoon_dir.join('cipd_packages').join(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 00fbc5c..2b6e332 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
@@ -1560,7 +1560,7 @@
"idevice_id",
"-l"
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1605,7 +1605,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": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -2097,7 +2097,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -2143,7 +2143,7 @@
"[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -2653,7 +2653,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -2705,7 +2705,7 @@
"--timeout",
"120"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -2753,7 +2753,7 @@
"[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 8e872fe..d6bfd0a 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -1560,7 +1560,7 @@
"idevice_id",
"-l"
],
- "cwd": "[CACHE]/cocoon/device_doctor/tool/infra-dialog",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1605,7 +1605,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": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -2097,7 +2097,7 @@
"pub",
"get"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -2143,7 +2143,7 @@
"[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
- "cwd": "[CACHE]/cocoon/device_doctor",
+ "cwd": "[CACHE]/cocoon/cipd_packages/device_doctor",
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
