Slim down builder CIPD packages.

The Android builders don't need the clang_linux asset.
I don't think anything needs the android_sdk asset.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3740

Change-Id: I3e61ba23ed661a998f9dc0eb4c46cc8eb1cf3226
Reviewed-on: https://skia-review.googlesource.com/3740
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

6 files changed, 1 insertions, 78 deletions

diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json
index 49c8306c26..800cd7f818 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json
@@ -262,16 +262,6 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "read android_sdk VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_darwin/VERSION",
       "/path/to/tmp/"
     ],
@@ -387,8 +377,6 @@
       "stepname:compile_skia on Mac",
       "--idempotent",
       "--cipd-package",
-      "android_sdk:skia/bots/android_sdk:version:0",
-      "--cipd-package",
       "android_ndk_darwin:skia/bots/android_ndk_darwin:version:0",
       "[dummy hash for compile_skia]",
       "--",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
index 8f64f9d38a..8ab0f27deb 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
@@ -262,16 +262,6 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "read android_sdk VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION",
       "/path/to/tmp/"
     ],
@@ -387,8 +377,6 @@
       "stepname:compile_skia on Ubuntu",
       "--idempotent",
       "--cipd-package",
-      "android_sdk:skia/bots/android_sdk:version:0",
-      "--cipd-package",
       "android_ndk_linux:skia/bots/android_ndk_linux:version:0",
       "[dummy hash for compile_skia]",
       "--",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json
index d98723859f..053f622f31 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json
@@ -262,16 +262,6 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "read android_sdk VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION",
       "/path/to/tmp/"
     ],
@@ -281,16 +271,6 @@
     "cmd": [
       "python",
       "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/infra/bots/assets/clang_linux/VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "read clang_linux VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[SLAVE_BUILD]/swarming_temp_dir",
       "511"
@@ -397,11 +377,7 @@
       "stepname:compile_skia on Ubuntu",
       "--idempotent",
       "--cipd-package",
-      "android_sdk:skia/bots/android_sdk:version:0",
-      "--cipd-package",
       "android_ndk_linux:skia/bots/android_ndk_linux:version:0",
-      "--cipd-package",
-      "clang_linux:skia/bots/clang_linux:version:0",
       "[dummy hash for compile_skia]",
       "--",
       "--workdir",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
index 03d9e97492..aa31e8c58c 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
@@ -262,16 +262,6 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "read android_sdk VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION",
       "/path/to/tmp/"
     ],
@@ -387,8 +377,6 @@
       "stepname:compile_skia on Ubuntu",
       "--idempotent",
       "--cipd-package",
-      "android_sdk:skia/bots/android_sdk:version:0",
-      "--cipd-package",
       "android_ndk_linux:skia/bots/android_ndk_linux:version:0",
       "[dummy hash for compile_skia]",
       "--",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
index 017542b9bb..ef652871ea 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
@@ -262,16 +262,6 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "read android_sdk VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION",
       "/path/to/tmp/"
     ],
@@ -387,8 +377,6 @@
       "stepname:compile_skia on Ubuntu",
       "--idempotent",
       "--cipd-package",
-      "android_sdk:skia/bots/android_sdk:version:0",
-      "--cipd-package",
       "android_ndk_linux:skia/bots/android_ndk_linux:version:0",
       "[dummy hash for compile_skia]",
       "--",
diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index 15b4d8d2bf..f46dcd0115 100644
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -387,13 +387,11 @@ def compile_steps_swarm(api, builder_cfg, got_revision, infrabots_dir):
 
   # Android bots require a toolchain.
   if 'Android' in builder_name:
-    cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_sdk'))
     if 'Mac' in builder_name:
       cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_ndk_darwin'))
     else:
       cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_ndk_linux'))
-
-  if 'Ubuntu' in builder_name and 'Clang' in builder_name:
+  elif 'Ubuntu' in builder_name and 'Clang' in builder_name:
     cipd_packages.append(cipd_pkg(api, infrabots_dir, 'clang_linux'))
 
   # Windows bots require a toolchain.
@@ -701,9 +699,6 @@ def test_for_bot(api, builder, mastername, slavename, testname=None):
     test += api.properties(issue=500,
                            patchset=1,
                            rietveld='https://codereview.chromium.org')
-  if 'Android' in builder:
-    paths.append(api.path['slave_build'].join(
-        'skia', 'infra', 'bots', 'assets', 'android_sdk', 'VERSION'))
   if 'Test' in builder and 'Coverage' not in builder:
     test += api.step_data(
         'upload new .isolated file for test_skia',