Change mechanism that allows to keep using engine.version for monorepo testing.
Instead of renaming DEPS, rename engine/src/.gn.
Change is required due to https://github.com/flutter/flutter/pull/161249/commits/f8cf7d638a95b7b982f615c86716df43bc62dd00 which adds a test that is looking for DEPS.
TEST=Failing build https://ci.chromium.org/ui/p/dart/builders/ci.sandbox/flutter-linux-framework-tests-misc/4827/overview, which now passes https://ci.chromium.org/ui/p/dart/builders/ci.sandbox.shadow/flutter-linux-framework-tests-misc/4/overview
Change-Id: I8155701b1259db26f16df2a29a0ad009e99528fe
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/61940
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
diff --git a/recipes/engine_v2/tester.expected/engine.json b/recipes/engine_v2/tester.expected/engine.json
index 60b36bb..b35fe88 100644
--- a/recipes/engine_v2/tester.expected/engine.json
+++ b/recipes/engine_v2/tester.expected/engine.json
@@ -428,8 +428,8 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[CACHE]/builder/flutter/DEPS",
- "[CACHE]/builder/flutter/DEPS.bak"
+ "[CACHE]/builder/flutter/engine/src/.gn",
+ "[CACHE]/builder/flutter/engine/src/.gn.bak"
],
"cwd": "[CACHE]/builder/flutter",
"env": {
@@ -466,7 +466,7 @@
"hostname": "rdbhost"
}
},
- "name": "Rename [CACHE]/builder/flutter/DEPS to DEPS.bak to preserve engine.version"
+ "name": "Rename [CACHE]/builder/flutter/engine/src/.gn to .gn.bak to preserve engine.version"
},
{
"cmd": [
diff --git a/recipes/engine_v2/tester.expected/monorepo.json b/recipes/engine_v2/tester.expected/monorepo.json
index 1a5d184..428bca1 100644
--- a/recipes/engine_v2/tester.expected/monorepo.json
+++ b/recipes/engine_v2/tester.expected/monorepo.json
@@ -662,8 +662,8 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[CACHE]/builder/flutter/DEPS",
- "[CACHE]/builder/flutter/DEPS.bak"
+ "[CACHE]/builder/flutter/engine/src/.gn",
+ "[CACHE]/builder/flutter/engine/src/.gn.bak"
],
"cwd": "[CACHE]/builder/flutter",
"env": {
@@ -700,7 +700,7 @@
"hostname": "rdbhost"
}
},
- "name": "Rename [CACHE]/builder/flutter/DEPS to DEPS.bak to preserve engine.version"
+ "name": "Rename [CACHE]/builder/flutter/engine/src/.gn to .gn.bak to preserve engine.version"
},
{
"cmd": [
diff --git a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
index 7ab4b2c..cbfd8b3 100644
--- a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
+++ b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
@@ -731,8 +731,8 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[CACHE]/builder/flutter/DEPS",
- "[CACHE]/builder/flutter/DEPS.bak"
+ "[CACHE]/builder/flutter/engine/src/.gn",
+ "[CACHE]/builder/flutter/engine/src/.gn.bak"
],
"cwd": "[CACHE]/builder/flutter",
"env": {
@@ -776,7 +776,7 @@
"hostname": "rdbhost"
}
},
- "name": "Rename [CACHE]/builder/flutter/DEPS to DEPS.bak to preserve engine.version"
+ "name": "Rename [CACHE]/builder/flutter/engine/src/.gn to .gn.bak to preserve engine.version"
},
{
"cmd": [
diff --git a/recipes/engine_v2/tester.expected/monorepo_tryjob.json b/recipes/engine_v2/tester.expected/monorepo_tryjob.json
index 138644e..b7e7b7c 100644
--- a/recipes/engine_v2/tester.expected/monorepo_tryjob.json
+++ b/recipes/engine_v2/tester.expected/monorepo_tryjob.json
@@ -428,8 +428,8 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[CACHE]/builder/flutter/DEPS",
- "[CACHE]/builder/flutter/DEPS.bak"
+ "[CACHE]/builder/flutter/engine/src/.gn",
+ "[CACHE]/builder/flutter/engine/src/.gn.bak"
],
"cwd": "[CACHE]/builder/flutter",
"env": {
@@ -466,7 +466,7 @@
"hostname": "rdbhost"
}
},
- "name": "Rename [CACHE]/builder/flutter/DEPS to DEPS.bak to preserve engine.version"
+ "name": "Rename [CACHE]/builder/flutter/engine/src/.gn to .gn.bak to preserve engine.version"
},
{
"cmd": [
diff --git a/recipes/engine_v2/tester.expected/monorepo_web_tests.json b/recipes/engine_v2/tester.expected/monorepo_web_tests.json
index c6bab6e..09f89f8 100644
--- a/recipes/engine_v2/tester.expected/monorepo_web_tests.json
+++ b/recipes/engine_v2/tester.expected/monorepo_web_tests.json
@@ -748,8 +748,8 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[CACHE]/builder/flutter/DEPS",
- "[CACHE]/builder/flutter/DEPS.bak"
+ "[CACHE]/builder/flutter/engine/src/.gn",
+ "[CACHE]/builder/flutter/engine/src/.gn.bak"
],
"cwd": "[CACHE]/builder/flutter",
"env": {
@@ -790,7 +790,7 @@
"hostname": "rdbhost"
}
},
- "name": "Rename [CACHE]/builder/flutter/DEPS to DEPS.bak to preserve engine.version"
+ "name": "Rename [CACHE]/builder/flutter/engine/src/.gn to .gn.bak to preserve engine.version"
},
{
"cmd": [
diff --git a/recipes/engine_v2/tester.py b/recipes/engine_v2/tester.py
index b925a87..e5e37b1 100644
--- a/recipes/engine_v2/tester.py
+++ b/recipes/engine_v2/tester.py
@@ -129,8 +129,8 @@
shard_name = shard
env['FLUTTER_STORAGE_BASE_URL'] = artifact_url
with api.context(env=env, env_prefixes=env_prefixes, cwd=flutter):
- api.file.move('Rename %s/DEPS to DEPS.bak to preserve engine.version' % flutter,
- flutter / 'DEPS', flutter / 'DEPS.bak')
+ api.file.move('Rename %s/engine/src/.gn to .gn.bak to preserve engine.version' % flutter,
+ flutter / 'engine' / 'src' / '.gn', flutter / 'engine' / 'src' / '.gn.bak')
api.retry.step(
'download dependencies', ['flutter', 'update-packages', '-v'],
max_attempts=2,
