Remove cleaning of the android sdk caches.
Remove the change that cleaned android sdk caches (https://flutter-review.googlesource.com/c/recipes/+/13506). The cleaning of the caches have added about 10mins to tasks, which adversely impact the queue length, and jobs are pending for multiple hours.
The longer term fix is to bundle the entire android sdk into a single cipd package, which will avoid the issue of corrupted caches.
Change-Id: Ic512575e2d97b38f344046192d16eb03dc76fced
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/13720
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Yusuf Mohsinally <mohsinally@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/flutter_deps/api.py b/recipe_modules/flutter_deps/api.py
index 7a4415d..32018c5 100644
--- a/recipe_modules/flutter_deps/api.py
+++ b/recipe_modules/flutter_deps/api.py
@@ -227,8 +227,6 @@
"""Installs android sdk."""
version = version or '29.0.2'
root_path = self.m.path['cache'].join('android')
- self.m.file.rmtree('Clobber android cache', root_path)
- self.m.file.ensure_directory('Ensure android cache', root_path)
self.m.android_sdk.install(root_path, env, env_prefixes)
def gems(self, env, env_prefixes, gemfile_dir):
diff --git a/recipe_modules/flutter_deps/examples/full.expected/basic.json b/recipe_modules/flutter_deps/examples/full.expected/basic.json
index 3a02585..df7ed28 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/basic.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/basic.json
@@ -267,34 +267,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
index 113b1df..50f8248 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
@@ -267,34 +267,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
index 3a02585..df7ed28 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
@@ -267,34 +267,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index 07aef65..a44be70 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -329,34 +329,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipe_modules/flutter_deps/examples/full.expected/windows.json b/recipe_modules/flutter_deps/examples/full.expected/windows.json
index 3a27015..14eca16 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/windows.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/windows.json
@@ -267,34 +267,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]\\android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]\\android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
index 1d1ab8d..7a4bb38 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
@@ -267,34 +267,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipes/flutter/flutter_drone.expected/android_sdk.json b/recipes/flutter/flutter_drone.expected/android_sdk.json
index 4d79225..70bf73e 100644
--- a/recipes/flutter/flutter_drone.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone.expected/android_sdk.json
@@ -123,34 +123,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json b/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json
index af90c55..8e41150 100644
--- a/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone_1_26_0.expected/android_sdk.json
@@ -123,34 +123,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
diff --git a/recipes/flutter/flutter_drone_2_2_0.expected/android_sdk.json b/recipes/flutter/flutter_drone_2_2_0.expected/android_sdk.json
index 18b0830..c4ae808 100644
--- a/recipes/flutter/flutter_drone_2_2_0.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone_2_2_0.expected/android_sdk.json
@@ -123,34 +123,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Clobber android cache"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/android"
- ],
- "infra_step": true,
- "name": "Ensure android cache"
- },
- {
"cmd": [],
"name": "download Android SDK components"
},
