commit e3f6f20c20ec4d6a9263df055fc0b4324c9d594c
author Alexander Thomas <athom@google.com> Thu Apr 02 09:38:59 2020 +0200
committer Alexander Thomas <athom@google.com> Thu Apr 02 08:56:16 2020 +0000
tree f62e8f1de2b9836371aa0f1bd349bdfc7700c5fa
parent 69a6bde2840f63067627641e87a741f0938cf8d9

[docker] Remove Dart SDK dependency from docker.py

The last Dart SDK call from build_push has been removed in
https://github.com/dart-lang/dart_docker/pull/55, so docker.py no longer
needs to provision a Dart SDK.

https://github.com/dart-lang/sdk/issues/40991

Change-Id: I2b796e7e839ac5dedb1fd7f5bb443f0ee3543536
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/142100
Reviewed-by: William Hesse <whesse@google.com>

README.recipes.md

diff --git a/README.recipes.md b/README.recipes.md
index c151a89..b80b372 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -107,9 +107,9 @@
 — **def [RunSteps](/recipes/dart/chocolatey.py#25)(api):**
 ### *recipes* / [dart/docker](/recipes/dart/docker.py)
 
-[DEPS](/recipes/dart/docker.py#7): [dart](#recipe_modules-dart), [depot\_tools/git][depot_tools/recipe_modules/git], [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/dart/docker.py#7): [dart](#recipe_modules-dart), [depot\_tools/git][depot_tools/recipe_modules/git], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
 
-— **def [RunSteps](/recipes/dart/docker.py#17)(api):**
+— **def [RunSteps](/recipes/dart/docker.py#16)(api):**
 ### *recipes* / [dart/external](/recipes/dart/external.py)
 
 [DEPS](/recipes/dart/external.py#7): [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]

recipes/dart/docker.expected/release.json

diff --git a/recipes/dart/docker.expected/release.json b/recipes/dart/docker.expected/release.json
index f912d7a..496f5ba 100644
--- a/recipes/dart/docker.expected/release.json
+++ b/recipes/dart/docker.expected/release.json
@@ -89,32 +89,6 @@
       "cipd",
       "ensure",
       "-root",
-      "[CLEANUP]/sdk",
-      "-ensure-file",
-      "dart/dart-sdk/${platform} stable",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-stable----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"dart/dart-sdk/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
       "[START_DIR]/cloudkms",
       "-ensure-file",
       "infra/tools/luci/cloudkms/${platform} latest",
@@ -125,7 +99,7 @@
     "env": {
       "DOCKER_CONFIG": "[CLEANUP]/.docker"
     },
-    "name": "ensure_installed (2)",
+    "name": "ensure_installed",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
@@ -196,11 +170,6 @@
     "env": {
       "DOCKER_CONFIG": "[CLEANUP]/.docker"
     },
-    "env_prefixes": {
-      "PATH": [
-        "[CLEANUP]/sdk/dart-sdk/bin"
-      ]
-    },
     "name": "build and push"
   },
   {

recipes/dart/docker.py

diff --git a/recipes/dart/docker.py b/recipes/dart/docker.py
index ba779ae..c52ea09 100644
--- a/recipes/dart/docker.py
+++ b/recipes/dart/docker.py
@@ -7,7 +7,6 @@
 DEPS = [
     'dart',
     'depot_tools/git',
-    'recipe_engine/cipd',
     'recipe_engine/context',
     'recipe_engine/path',
     'recipe_engine/properties',
@@ -17,9 +16,6 @@
 def RunSteps(api):
   version = api.properties.get('version')
   api.git.checkout(url='https://github.com/dart-lang/dart_docker.git')
-  cipd_ensure_file = api.cipd.EnsureFile()
-  cipd_ensure_file.add_package('dart/dart-sdk/${platform}', 'stable')
-  api.cipd.ensure(api.path['cleanup'].join('sdk'), cipd_ensure_file)
 
   env = {
     'DOCKER_CONFIG': api.path['cleanup'].join('.docker'),
@@ -33,13 +29,10 @@
       % dockerhub_key]
     api.step('docker login', login)
 
-  env_prefixes = {
-    'PATH': [api.path['cleanup'].join('sdk').join('dart-sdk').join('bin')],
-  }
   build_push = (api.path['start_dir']
       .join('dart_docker')
       .join('build_push.sh'))
-  with api.context(env=env, env_prefixes=env_prefixes):
+  with api.context(env=env):
     api.step('build and push', [build_push, 'google', version])
 
 def GenTests(api):