commit aa02148361784a3d74a4d02832b83b800c2784f6
author Godofredo Contreras <godofredoc@google.com> Wed Nov 18 19:01:26 2020 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 18 19:01:26 2020 +0000
tree 64ddb329cd18478743d786355a59ab888e530fbb
parent f5e77477c156659c4c6284cf981b50f6779e7f27

Fix problems with .packages not available in devicelab tasks.

Linux devicelab tasks are failing to find .packages when running tasks,
this is because we haven't been running flutter update-packages.

Change-Id: I185fe053ce7d0aae87d4e92efb3be874730215e1
Bugs: https://github.com/flutter/flutter/issues/70775
  https://github.com/flutter/flutter/issues/70774
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/8900
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>

recipes/devicelab/devicelab_drone.expected/basic.json

diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json
index 4c18c4a..7718479 100644
--- a/recipes/devicelab/devicelab_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -147,6 +147,29 @@
   },
   {
     "cmd": [
+      "flutter",
+      "update-packages"
+    ],
+    "cwd": "[START_DIR]/flutter/dev/devicelab",
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[CACHE]/.pub-cache",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "name": "flutter update-packages"
+  },
+  {
+    "cmd": [
       "pub",
       "get"
     ],

recipes/devicelab/devicelab_drone.expected/post-submit.json

diff --git a/recipes/devicelab/devicelab_drone.expected/post-submit.json b/recipes/devicelab/devicelab_drone.expected/post-submit.json
index dc8bf94..07342cf 100644
--- a/recipes/devicelab/devicelab_drone.expected/post-submit.json
+++ b/recipes/devicelab/devicelab_drone.expected/post-submit.json
@@ -171,6 +171,29 @@
   },
   {
     "cmd": [
+      "flutter",
+      "update-packages"
+    ],
+    "cwd": "[START_DIR]/flutter/dev/devicelab",
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[CACHE]/.pub-cache",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "name": "flutter update-packages"
+  },
+  {
+    "cmd": [
       "pub",
       "get"
     ],

recipes/devicelab/devicelab_drone.expected/xcode.json

diff --git a/recipes/devicelab/devicelab_drone.expected/xcode.json b/recipes/devicelab/devicelab_drone.expected/xcode.json
index f0a7413..54af01e 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode.json
@@ -147,6 +147,29 @@
   },
   {
     "cmd": [
+      "flutter",
+      "update-packages"
+    ],
+    "cwd": "[START_DIR]/flutter/dev/devicelab",
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[CACHE]/.pub-cache",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "name": "flutter update-packages"
+  },
+  {
+    "cmd": [
       "pub",
       "get"
     ],

recipes/devicelab/devicelab_drone.py

diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index a13b82e..09c7e60 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -46,14 +46,16 @@
     service_account = api.service_account.default()
     access_token = service_account.get_access_token()
     access_token_path = api.path.mkstemp()
-    api.file.write_text("write token", access_token_path, access_token,
-                        include_log=False)
+    api.file.write_text(
+        "write token", access_token_path, access_token, include_log=False
+    )
     service_account_args = ['--service-account-token-file', access_token_path]
   # Run test
   test_runner_command = ['dart', 'bin/run.dart', '-t', task_name]
   test_runner_command.extend(service_account_args)
   with api.context(env=env, env_prefixes=env_prefixes, cwd=devicelab_path):
     api.step('flutter doctor', ['flutter', 'doctor', '--verbose'])
+    api.step('flutter update-packages', ['flutter', 'update-packages'])
     api.step('pub get', ['pub', 'get'])
     dep_list = {d['dependency']: d.get('version') for d in deps}
     if dep_list.has_key('xcode'):