[web] Remove the usage of the flutter/goldens repo
Bug: https://github.com/flutter/flutter/issues/62706
Change-Id: Ie2c7e9b97c02abea9cf350669075b333efb2c172
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/24640
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Mouad Debbar <mdebbar@google.com>
diff --git a/recipe_modules/web_util/api.py b/recipe_modules/web_util/api.py
index fc71968..dbec246 100644
--- a/recipe_modules/web_util/api.py
+++ b/recipe_modules/web_util/api.py
@@ -70,93 +70,6 @@
'latest-%s' % version)
self.m.cipd.ensure(chrome_driver_path, chrome_pkgdriver)
- def clone_goldens_repo(self, checkout):
- """Clone the repository that keeps golden files.
-
- The repository name and the reference SHA will be read from a file on the
- repo side.
- """
- builder_root = self.m.path['cache'].join('builder')
- goldens = builder_root.join('goldens')
- self.m.file.ensure_directory('mkdir goldens', goldens)
- golden_yaml_file = checkout.join('flutter', 'lib', 'web_ui', 'dev',
- 'goldens_lock.yaml')
- with self.m.context(cwd=builder_root):
- # Use golden_lock.yaml file to read url of the goldens repository and
- # the revision number to checkout.
- # https://github.com/flutter/engine/blob/master/lib/web_ui/dev/goldens_lock.yaml
- # This file is used by web engine developers. The engine developers update
- # the flutter/goldens.git repo when they need changes. Later change the
- # revision number on this file.
- result = self.m.yaml.read(
- 'read yaml',
- golden_yaml_file,
- self.m.json.output(),
- )
- # The content of the file is expected to be:
- #
- # repository: https://github.com/flutter/goldens.git
- # revision: b6efc75885c23f0b5c485d8bd659ed339feec9ec
- golden_lock_content = result.json.output
- repo = golden_lock_content['repository']
- revision_number = golden_lock_content['revision']
- with self.m.context(cwd=goldens):
- self.m.git.checkout(
- repo,
- dir_path=goldens,
- ref=revision_number,
- recursive=True,
- set_got_revision=True)
- golden_files = checkout.join('flutter', 'lib', 'web_ui', '.dart_tool',
- 'goldens')
- self.m.file.copytree('copy goldens', goldens, golden_files)
-
- def upload_failing_goldens(self, checkout, browser):
- """Upload the failed goldens files to a gcs bucket.
-
- Parse the logs to determine which golden tests are failed. Upload expected
- and actual golden files to a gcs bucket. Display links to html pages where
- developer can compare actual vs expected images.
- """
- logs_path = checkout.join('flutter', 'lib', 'web_ui', '.dart_tool',
- 'test_results')
- tests_info_file_path = logs_path.join('info.txt')
- self.m.file.write_text(
- 'write info file',
- tests_info_file_path,
- 'tests for %s' % self.m.platform.name,
- 'tests for windows',
- )
-
- if not self.m.properties.get(
- 'gcs_goldens_bucket') or self.m.runtime.is_experimental:
- # This is to avoid trying to upload files when 'gcs_goldens_bucket' is
- # missing or when running from led.
- return
-
- bucket_id = self.m.buildbucket.build.id
- self.m.gsutil.upload(
- bucket=self.m.properties['gcs_goldens_bucket'],
- source=logs_path,
- dest='%s/%s/%s' % ('web_engine', bucket_id, browser),
- link_name='archive goldens',
- args=['-r'],
- multithreaded=True,
- name='upload goldens %s' % bucket_id,
- unauthenticated_url=True)
- html_files = self.m.file.glob_paths(
- 'html goldens',
- source=logs_path,
- pattern='*.html',
- test_data=['a.html'])
- with self.m.step.nest('Failed golden links') as presentation:
- for html_file in html_files:
- base_name = self.m.path.basename(html_file)
- url = 'https://storage.googleapis.com/%s/web_engine/%s/%s/%s' % (
- self.m.properties['gcs_goldens_bucket'], bucket_id, browser,
- base_name)
- presentation.links[base_name] = url
-
def get_web_dependencies(self):
return self.m.properties.get('web_dependencies', [])
@@ -166,7 +79,6 @@
'chrome': self.chrome,
'chrome_driver': self.chrome_driver,
'firefox_driver': self.firefox_driver,
- 'goldens_repo': self.clone_goldens_repo,
}
for dep in self.get_web_dependencies():
dep_funct = available_deps.get(dep)
diff --git a/recipe_modules/web_util/examples/full.expected/chrome driver.json b/recipe_modules/web_util/examples/full.expected/chrome driver.json
index 968b502..d902203 100644
--- a/recipe_modules/web_util/examples/full.expected/chrome driver.json
+++ b/recipe_modules/web_util/examples/full.expected/chrome driver.json
@@ -83,24 +83,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for linux",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for linux@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/web_util/examples/full.expected/chrome.json b/recipe_modules/web_util/examples/full.expected/chrome.json
index 0977dd4..6666a54 100644
--- a/recipe_modules/web_util/examples/full.expected/chrome.json
+++ b/recipe_modules/web_util/examples/full.expected/chrome.json
@@ -83,24 +83,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for linux",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for linux@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/web_util/examples/full.expected/clone repo.json b/recipe_modules/web_util/examples/full.expected/clone repo.json
deleted file mode 100644
index 69377dd..0000000
--- a/recipe_modules/web_util/examples/full.expected/clone repo.json
+++ /dev/null
@@ -1,234 +0,0 @@
-[
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for linux",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for linux@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "-m",
- "----",
- "cp",
- "-r",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "gs://mybucket/web_engine/0/chrome"
- ],
- "infra_step": true,
- "name": "gsutil upload goldens 0",
- "~followup_annotations": [
- "@@@STEP_LINK@archive goldens@https://console.cloud.google.com/storage/browser/mybucket/web_engine/0/chrome@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "*.html"
- ],
- "infra_step": true,
- "name": "html goldens",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/a.html@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Failed golden links",
- "~followup_annotations": [
- "@@@STEP_LINK@a.html@https://storage.googleapis.com/mybucket/web_engine/0/chrome/a.html@@@"
- ]
- },
- {
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/recipe_modules/web_util/examples/full.expected/fail case.json b/recipe_modules/web_util/examples/full.expected/fail case.json
index 59a037a..03ebc81 100644
--- a/recipe_modules/web_util/examples/full.expected/fail case.json
+++ b/recipe_modules/web_util/examples/full.expected/fail case.json
@@ -9,7 +9,7 @@
"Traceback (most recent call last):",
" File \"RECIPE_REPO[flutter]/recipe_modules/web_util/examples/full.py\", line 21, in RunSteps",
" api.web_util.prepare_web_dependencies(engine_checkout_path)",
- " File \"RECIPE_REPO[flutter]/recipe_modules/web_util/api.py\", line 174, in prepare_web_dependencies",
+ " File \"RECIPE_REPO[flutter]/recipe_modules/web_util/api.py\", line 86, in prepare_web_dependencies",
" raise ValueError('Web Dependency %s not available.' % dep)",
"ValueError('Web Dependency invalid_dependency not available.')"
]
diff --git a/recipe_modules/web_util/examples/full.expected/firefox driver.json b/recipe_modules/web_util/examples/full.expected/firefox driver.json
index f214d56..170c738 100644
--- a/recipe_modules/web_util/examples/full.expected/firefox driver.json
+++ b/recipe_modules/web_util/examples/full.expected/firefox driver.json
@@ -28,24 +28,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for linux",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for linux@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/web_util/examples/full.expected/mac-post-submit.json b/recipe_modules/web_util/examples/full.expected/mac-post-submit.json
index d316eef..b6042b6 100644
--- a/recipe_modules/web_util/examples/full.expected/mac-post-submit.json
+++ b/recipe_modules/web_util/examples/full.expected/mac-post-submit.json
@@ -1,234 +1,5 @@
[
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for mac",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for mac@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "-m",
- "----",
- "cp",
- "-r",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "gs://mybucket/web_engine/0/chrome"
- ],
- "infra_step": true,
- "name": "gsutil upload goldens 0",
- "~followup_annotations": [
- "@@@STEP_LINK@archive goldens@https://console.cloud.google.com/storage/browser/mybucket/web_engine/0/chrome@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "*.html"
- ],
- "infra_step": true,
- "name": "html goldens",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/a.html@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Failed golden links",
- "~followup_annotations": [
- "@@@STEP_LINK@a.html@https://storage.googleapis.com/mybucket/web_engine/0/chrome/a.html@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/web_util/examples/full.py b/recipe_modules/web_util/examples/full.py
index 34f8d8d..26b9408 100644
--- a/recipe_modules/web_util/examples/full.py
+++ b/recipe_modules/web_util/examples/full.py
@@ -19,10 +19,8 @@
def RunSteps(api):
engine_checkout_path = api.path['cache'].join('builder', 'src')
api.web_util.prepare_web_dependencies(engine_checkout_path)
- api.web_util.upload_failing_goldens(engine_checkout_path, 'chrome')
def GenTests(api):
- golden_yaml_file = {'repository': 'repo', 'revision': 'b6efc758'}
browser_yaml_file = {
'required_driver_version': {
'chrome': 84
@@ -40,13 +38,6 @@
web_dependencies=['invalid_dependency'],), api.platform(
'linux', 64)) + api.platform.name('linux')
yield api.test(
- 'clone repo',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
- api.properties(
- gcs_goldens_bucket='mybucket',
- web_dependencies=['goldens_repo'],), api.platform(
- 'linux', 64)) + api.platform.name('linux') + api.runtime(is_experimental=False)
- yield api.test(
'chrome driver',
api.step_data('read browser lock yaml.parse',
api.json.output(browser_yaml_file)),
@@ -67,11 +58,9 @@
'linux', 64)) + api.platform.name('linux')
yield api.test(
'mac-post-submit',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
api.properties(
goma_jobs='200',
- gcs_goldens_bucket='mybucket',
- web_dependencies=['goldens_repo'],
+ web_dependencies=[],
command_args=['test', '--browser=ios-safari'],
command_name='ios-safari-unit-tests'), api.platform(
'mac', 64)) + api.runtime(is_experimental=False)
diff --git a/recipes/engine/web_engine_drone.expected/linux-error.json b/recipes/engine/web_engine_drone.expected/linux-error.json
index f577142..969acba 100644
--- a/recipes/engine/web_engine_drone.expected/linux-error.json
+++ b/recipes/engine/web_engine_drone.expected/linux-error.json
@@ -221,7 +221,7 @@
"Traceback (most recent call last):",
" File \"RECIPE_REPO[flutter]/recipes/engine/web_engine_drone.py\", line 84, in RunSteps",
" api.web_util.prepare_web_dependencies(checkout)",
- " File \"RECIPE_REPO[flutter]/recipe_modules/web_util/api.py\", line 174, in prepare_web_dependencies",
+ " File \"RECIPE_REPO[flutter]/recipe_modules/web_util/api.py\", line 86, in prepare_web_dependencies",
" raise ValueError('Web Dependency %s not available.' % dep)",
"ValueError('Web Dependency invalid_dependency not available.')"
]
diff --git a/recipes/engine/web_engine_drone.expected/linux-experimental.json b/recipes/engine/web_engine_drone.expected/linux-experimental.json
index 245e7aa..f7ec84b 100644
--- a/recipes/engine/web_engine_drone.expected/linux-experimental.json
+++ b/recipes/engine/web_engine_drone.expected/linux-experimental.json
@@ -212,172 +212,6 @@
]
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
"cmd": [],
"name": "install infra/tools/luci/cas"
},
@@ -567,48 +401,6 @@
"name": "felt test: test"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for linux",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for linux@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
"cmd": [],
"name": "Killing Processes"
},
diff --git a/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json b/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json
index f0eaccc..a66dd4d 100644
--- a/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json
+++ b/recipes/engine/web_engine_drone.expected/linux-firefox-integration.json
@@ -231,172 +231,6 @@
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
"copy",
"RECIPE_MODULE[recipe_engine::cas]/resources/infra.sha1",
"/path/to/tmp/"
@@ -608,141 +442,6 @@
"name": "felt test: firefox-tests"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for linux",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for linux@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "-m",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "gs://mybucket/web_engine/0/chrome"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "gsutil upload goldens 0",
- "~followup_annotations": [
- "@@@STEP_LINK@archive goldens@https://console.cloud.google.com/storage/browser/mybucket/web_engine/0/chrome@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "*.html"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "html goldens",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/a.html@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Failed golden links",
- "~followup_annotations": [
- "@@@STEP_LINK@a.html@https://storage.googleapis.com/mybucket/web_engine/0/chrome/a.html@@@"
- ]
- },
- {
"cmd": [],
"name": "Killing Processes"
},
diff --git a/recipes/engine/web_engine_drone.expected/linux-post-submit.json b/recipes/engine/web_engine_drone.expected/linux-post-submit.json
index ec7a30c..edc4e1c 100644
--- a/recipes/engine/web_engine_drone.expected/linux-post-submit.json
+++ b/recipes/engine/web_engine_drone.expected/linux-post-submit.json
@@ -369,172 +369,6 @@
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
"copy",
"RECIPE_MODULE[recipe_engine::cas]/resources/infra.sha1",
"/path/to/tmp/"
@@ -746,141 +580,6 @@
"name": "felt test: chrome-tests"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for linux",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for linux@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "-m",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "gs://mybucket/web_engine/0/chrome"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "gsutil upload goldens 0",
- "~followup_annotations": [
- "@@@STEP_LINK@archive goldens@https://console.cloud.google.com/storage/browser/mybucket/web_engine/0/chrome@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "*.html"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "html goldens",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/a.html@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Failed golden links",
- "~followup_annotations": [
- "@@@STEP_LINK@a.html@https://storage.googleapis.com/mybucket/web_engine/0/chrome/a.html@@@"
- ]
- },
- {
"cmd": [],
"name": "Killing Processes"
},
diff --git a/recipes/engine/web_engine_drone.expected/mac-post-submit.json b/recipes/engine/web_engine_drone.expected/mac-post-submit.json
index 4a0816c..ed261e8 100644
--- a/recipes/engine/web_engine_drone.expected/mac-post-submit.json
+++ b/recipes/engine/web_engine_drone.expected/mac-post-submit.json
@@ -203,172 +203,6 @@
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
"copy",
"RECIPE_MODULE[recipe_engine::cas]/resources/infra.sha1",
"/path/to/tmp/"
@@ -706,141 +540,6 @@
"name": "felt test: ios-safari-unit-tests"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for mac",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for mac@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "-m",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "gs://mybucket/web_engine/0/ios-safari"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "gsutil upload goldens 0",
- "~followup_annotations": [
- "@@@STEP_LINK@archive goldens@https://console.cloud.google.com/storage/browser/mybucket/web_engine/0/ios-safari@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results",
- "*.html"
- ],
- "cwd": "[CLEANUP]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CLEANUP]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CLEANUP]/builder",
- "GOMA_DIR": "[CACHE]/goma/client",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "html goldens",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[CLEANUP]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/a.html@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Failed golden links",
- "~followup_annotations": [
- "@@@STEP_LINK@a.html@https://storage.googleapis.com/mybucket/web_engine/0/ios-safari/a.html@@@"
- ]
- },
- {
"cmd": [],
"name": "Killing Processes"
},
diff --git a/recipes/engine/web_engine_drone.py b/recipes/engine/web_engine_drone.py
index e4feda6..361c0a5 100644
--- a/recipes/engine/web_engine_drone.py
+++ b/recipes/engine/web_engine_drone.py
@@ -130,8 +130,6 @@
with api.osx_sdk('ios'):
with recipe_api.defer_results():
api.step('felt test: %s' % command_name, felt_cmd)
- if web_dependencies and 'goldens_repo' in web_dependencies:
- api.web_util.upload_failing_goldens(checkout, 'ios-safari')
# This is to clean up leaked processes.
api.os_utils.kill_processes()
# Collect memory/cpu/process after task execution.
@@ -139,8 +137,6 @@
else:
with recipe_api.defer_results():
api.step('felt test: %s' % command_name, felt_cmd)
- if web_dependencies and 'goldens_repo' in web_dependencies:
- api.web_util.upload_failing_goldens(checkout, 'chrome')
# This is to clean up leaked processes.
api.os_utils.kill_processes()
# Collect memory/cpu/process after task execution.
@@ -148,7 +144,6 @@
def GenTests(api):
- golden_yaml_file = {'repository': 'repo', 'revision': 'b6efc758'}
browser_yaml_file = {
'required_driver_version': {'chrome': 84},
'chrome': {'Linux': '768968', 'Mac': '768985', 'Win': '768975'}
@@ -161,11 +156,10 @@
api.step_data(
'read browser lock yaml (2).parse',
api.json.output(browser_yaml_file)
- ), api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
+ ),
api.properties(
goma_jobs='200',
- gcs_goldens_bucket='mybucket',
- web_dependencies=['chrome_driver', 'chrome', 'goldens_repo'],
+ web_dependencies=['chrome_driver', 'chrome'],
command_args=['test', '--browser=chrome'],
command_name='chrome-tests',
local_engine_cas_hash='abceqwe'
@@ -173,11 +167,9 @@
) + api.runtime(is_experimental=False) + api.platform.name('linux')
yield api.test(
'linux-firefox-integration',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
api.properties(
goma_jobs='200',
- gcs_goldens_bucket='mybucket',
- web_dependencies=['firefox_driver', 'goldens_repo'],
+ web_dependencies=['firefox_driver'],
command_args=['test', '--browser=firefox'],
command_name='firefox-tests',
local_engine_cas_hash='abceqwe'
@@ -188,11 +180,9 @@
) + api.platform('win', 32) + api.runtime(is_experimental=False)
yield api.test(
'mac-post-submit',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
api.properties(
goma_jobs='200',
- gcs_goldens_bucket='mybucket',
- web_dependencies=['goldens_repo'],
+ web_dependencies=[],
command_args=['test', '--browser=ios-safari', '--require-skia-gold'],
command_name='ios-safari-unit-tests',
local_engine_cas_hash='abceqwe'
@@ -200,13 +190,12 @@
) + api.runtime(is_experimental=False)
yield api.test(
'linux-experimental',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
api.repo_util.flutter_environment_data(),
api.properties(
goma_jobs='200',
git_url='https://mygitrepo',
git_ref='refs/pull/1/head',
- web_dependencies=['goldens_repo'],
+ web_dependencies=[],
clobber=True,
local_engine_cas_hash='abceqwe'
), api.platform('linux', 64)
diff --git a/recipes/web_engine.expected/linux-post-submit.json b/recipes/web_engine.expected/linux-post-submit.json
index 5a3e5b9..ef8f736 100644
--- a/recipes/web_engine.expected/linux-post-submit.json
+++ b/recipes/web_engine.expected/linux-post-submit.json
@@ -833,7 +833,7 @@
},
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\", \"--require-skia-gold\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\", \"goldens_repo\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\", \"--require-skia-gold\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -878,8 +878,7 @@
"@@@STEP_LOG_LINE@request@ \"inherited_dependencies\": [], @@@",
"@@@STEP_LOG_LINE@request@ \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", @@@",
"@@@STEP_LOG_LINE@request@ \"web_dependencies\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"chrome\", @@@",
- "@@@STEP_LOG_LINE@request@ \"goldens_repo\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"chrome\"@@@",
"@@@STEP_LOG_LINE@request@ ]@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", @@@",
diff --git a/recipes/web_engine.expected/linux-pre-submit.json b/recipes/web_engine.expected/linux-pre-submit.json
index ca7ea07..9fd5836 100644
--- a/recipes/web_engine.expected/linux-pre-submit.json
+++ b/recipes/web_engine.expected/linux-pre-submit.json
@@ -848,7 +848,7 @@
},
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\", \"--require-skia-gold\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\", \"goldens_repo\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\", \"--require-skia-gold\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -893,8 +893,7 @@
"@@@STEP_LOG_LINE@request@ \"inherited_dependencies\": [], @@@",
"@@@STEP_LOG_LINE@request@ \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", @@@",
"@@@STEP_LOG_LINE@request@ \"web_dependencies\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"chrome\", @@@",
- "@@@STEP_LOG_LINE@request@ \"goldens_repo\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"chrome\"@@@",
"@@@STEP_LOG_LINE@request@ ]@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", @@@",
diff --git a/recipes/web_engine.expected/mac-post-submit.json b/recipes/web_engine.expected/mac-post-submit.json
index b3d6528..dea3370 100644
--- a/recipes/web_engine.expected/mac-post-submit.json
+++ b/recipes/web_engine.expected/mac-post-submit.json
@@ -247,172 +247,6 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
"python",
"-u",
"RECIPE_REPO[depot_tools]/gclient.py",
@@ -1253,45 +1087,6 @@
"name": "test: felt ios-safari test"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for mac",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "cwd": "[CACHE]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CACHE]/builder",
- "FLUTTER_PREBUILT_DART_SDK": "True",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for mac@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
"cmd": [],
"name": "Killing Processes"
},
diff --git a/recipes/web_engine.py b/recipes/web_engine.py
index da15134..abebcb4 100644
--- a/recipes/web_engine.py
+++ b/recipes/web_engine.py
@@ -135,9 +135,6 @@
env, env_prefixes, api.properties.get('dependencies', [])
)
- if api.platform.is_mac:
- api.web_util.clone_goldens_repo(checkout)
-
with api.context(cwd=cache_root, env=env,
env_prefixes=env_prefixes), api.depot_tools.on_path():
@@ -230,7 +227,6 @@
api.step(
api.test_utils.test_step_name('felt ios-safari test'), felt_test
)
- api.web_util.upload_failing_goldens(checkout, 'ios-safari')
CleanUpProcesses(api)
else:
api.web_util.chrome(checkout)
@@ -248,7 +244,7 @@
# For running Chrome Unit tests:
command_name = 'chrome-unit-linux'
# These are the required dependencies.
- web_dependencies = ['chrome', 'goldens_repo']
+ web_dependencies = ['chrome']
# These are the felt commands which will be used.
command_args = ['test', '--browser=chrome', '--require-skia-gold']
addShardTask(
@@ -308,7 +304,6 @@
'required_driver_version': {'chrome': 84},
'chrome': {'Linux': '768968', 'Mac': '768985', 'Win': '768975'}
}
- golden_yaml_file = {'repository': 'repo', 'revision': 'b6efc758'}
yield api.test('linux-post-submit') + api.properties(
goma_jobs='200'
) + api.platform('linux', 64) + api.runtime(is_experimental=False)
@@ -320,13 +315,11 @@
) + api.runtime(is_experimental=False)
yield api.test(
'mac-post-submit',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
api.properties(goma_jobs='200'), api.platform('mac', 64)
) + api.runtime(is_experimental=False)
yield api.test('linux-pre-submit') + api.properties(
goma_jobs='200',
git_url='https://mygitrepo',
git_ref='refs/pull/1/head',
- gcs_goldens_bucket='mybucket',
clobber=True
) + api.platform('linux', 64) + api.runtime(is_experimental=False)
diff --git a/recipes/web_engine_2_5_0.expected/linux-post-submit.json b/recipes/web_engine_2_5_0.expected/linux-post-submit.json
index 9a262c8..41ee581 100644
--- a/recipes/web_engine_2_5_0.expected/linux-post-submit.json
+++ b/recipes/web_engine_2_5_0.expected/linux-post-submit.json
@@ -833,7 +833,7 @@
},
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"dependencies\": [\"chrome\", \"goldens_repo\"], \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"dependencies\": [], \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"dependencies\": [\"chrome\"], \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"dependencies\": [], \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -873,8 +873,7 @@
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"command_name\": \"chrome-unit-linux\", @@@",
"@@@STEP_LOG_LINE@request@ \"dependencies\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"chrome\", @@@",
- "@@@STEP_LOG_LINE@request@ \"goldens_repo\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"chrome\"@@@",
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"git_ref\": \"refs/heads/master\", @@@",
"@@@STEP_LOG_LINE@request@ \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", @@@",
diff --git a/recipes/web_engine_2_5_0.expected/linux-pre-submit.json b/recipes/web_engine_2_5_0.expected/linux-pre-submit.json
index 5d39d9c..6733cc3 100644
--- a/recipes/web_engine_2_5_0.expected/linux-pre-submit.json
+++ b/recipes/web_engine_2_5_0.expected/linux-pre-submit.json
@@ -848,7 +848,7 @@
},
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"dependencies\": [\"chrome\", \"goldens_repo\"], \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"dependencies\": [], \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"dependencies\": [\"chrome\"], \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"dependencies\": [], \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -888,8 +888,7 @@
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"command_name\": \"chrome-unit-linux\", @@@",
"@@@STEP_LOG_LINE@request@ \"dependencies\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"chrome\", @@@",
- "@@@STEP_LOG_LINE@request@ \"goldens_repo\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"chrome\"@@@",
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"git_ref\": \"refs/pull/1/head\", @@@",
"@@@STEP_LOG_LINE@request@ \"git_url\": \"https://mygitrepo\", @@@",
diff --git a/recipes/web_engine_2_5_0.expected/mac-post-submit.json b/recipes/web_engine_2_5_0.expected/mac-post-submit.json
index feb11bf..8e9aca7 100644
--- a/recipes/web_engine_2_5_0.expected/mac-post-submit.json
+++ b/recipes/web_engine_2_5_0.expected/mac-post-submit.json
@@ -247,172 +247,6 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
"python",
"-u",
"RECIPE_REPO[depot_tools]/gclient.py",
@@ -1252,45 +1086,6 @@
"name": "felt ios-safari test"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for mac",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "cwd": "[CACHE]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CACHE]/builder",
- "FLUTTER_PREBUILT_DART_SDK": "True",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for mac@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
"cmd": [],
"name": "Killing Processes"
},
diff --git a/recipes/web_engine_2_5_0.py b/recipes/web_engine_2_5_0.py
index 6231463..2df4468 100644
--- a/recipes/web_engine_2_5_0.py
+++ b/recipes/web_engine_2_5_0.py
@@ -128,9 +128,6 @@
# Checkout source code and build
api.repo_util.engine_checkout(cache_root, env, env_prefixes)
- if api.platform.is_mac:
- api.web_util.clone_goldens_repo(checkout)
-
with api.context(cwd=cache_root, env=env,
env_prefixes=env_prefixes), api.depot_tools.on_path():
@@ -218,7 +215,6 @@
felt_test.append('test')
felt_test.extend(additional_args)
api.step('felt ios-safari test', felt_test)
- api.web_util.upload_failing_goldens(checkout, 'ios-safari')
CleanUpProcesses(api)
else:
api.web_util.chrome(checkout)
@@ -236,7 +232,7 @@
# For running Chrome Unit tests:
command_name = 'chrome-unit-linux'
# These are the required dependencies.
- dependencies = ['chrome', 'goldens_repo']
+ dependencies = ['chrome']
# These are the felt commands which will be used.
command_args = ['test', '--browser=chrome']
addShardTask(
@@ -292,7 +288,6 @@
'required_driver_version': {'chrome': 84},
'chrome': {'Linux': '768968', 'Mac': '768985', 'Win': '768975'}
}
- golden_yaml_file = {'repository': 'repo', 'revision': 'b6efc758'}
yield api.test('linux-post-submit') + api.properties(
goma_jobs='200'
) + api.platform('linux', 64) + api.runtime(is_experimental=False)
@@ -304,13 +299,11 @@
) + api.runtime(is_experimental=False)
yield api.test(
'mac-post-submit',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
api.properties(goma_jobs='200'), api.platform('mac', 64)
) + api.runtime(is_experimental=False)
yield api.test('linux-pre-submit') + api.properties(
goma_jobs='200',
git_url='https://mygitrepo',
git_ref='refs/pull/1/head',
- gcs_goldens_bucket='mybucket',
clobber=True
) + api.platform('linux', 64) + api.runtime(is_experimental=False)
diff --git a/recipes/web_engine_2_8_0.expected/linux-post-submit.json b/recipes/web_engine_2_8_0.expected/linux-post-submit.json
index 8357f29..bdd604c 100644
--- a/recipes/web_engine_2_8_0.expected/linux-post-submit.json
+++ b/recipes/web_engine_2_8_0.expected/linux-post-submit.json
@@ -833,7 +833,7 @@
},
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\", \"goldens_repo\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/heads/master\", \"git_url\": \"https://chromium.googlesource.com/external/github.com/flutter/engine\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -877,8 +877,7 @@
"@@@STEP_LOG_LINE@request@ \"inherited_dependencies\": [], @@@",
"@@@STEP_LOG_LINE@request@ \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", @@@",
"@@@STEP_LOG_LINE@request@ \"web_dependencies\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"chrome\", @@@",
- "@@@STEP_LOG_LINE@request@ \"goldens_repo\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"chrome\"@@@",
"@@@STEP_LOG_LINE@request@ ]@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", @@@",
diff --git a/recipes/web_engine_2_8_0.expected/linux-pre-submit.json b/recipes/web_engine_2_8_0.expected/linux-pre-submit.json
index e65c1fc..da99316 100644
--- a/recipes/web_engine_2_8_0.expected/linux-pre-submit.json
+++ b/recipes/web_engine_2_8_0.expected/linux-pre-submit.json
@@ -848,7 +848,7 @@
},
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\", \"goldens_repo\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=chrome\"], \"command_name\": \"chrome-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": [\"chrome\"]}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"builder\": \"Linux Web Drone\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"priority\": 25, \"properties\": {\"command_args\": [\"test\", \"--browser=firefox\"], \"command_name\": \"firefox-unit-linux\", \"git_ref\": \"refs/pull/1/head\", \"git_url\": \"https://mygitrepo\", \"inherited_dependencies\": [], \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"web_dependencies\": []}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -892,8 +892,7 @@
"@@@STEP_LOG_LINE@request@ \"inherited_dependencies\": [], @@@",
"@@@STEP_LOG_LINE@request@ \"local_engine_cas_hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", @@@",
"@@@STEP_LOG_LINE@request@ \"web_dependencies\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"chrome\", @@@",
- "@@@STEP_LOG_LINE@request@ \"goldens_repo\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"chrome\"@@@",
"@@@STEP_LOG_LINE@request@ ]@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", @@@",
diff --git a/recipes/web_engine_2_8_0.expected/mac-post-submit.json b/recipes/web_engine_2_8_0.expected/mac-post-submit.json
index c2a60c3..6ff99b0 100644
--- a/recipes/web_engine_2_8_0.expected/mac-post-submit.json
+++ b/recipes/web_engine_2_8_0.expected/mac-post-submit.json
@@ -247,172 +247,6 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/goldens"
- ],
- "infra_step": true,
- "name": "mkdir goldens"
- },
- {
- "cmd": [],
- "name": "read yaml",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@yaml@@@@",
- "@@@STEP_LOG_END@yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "/path/to/tmp/"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.read",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@goldens_lock.yaml@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
- "--yaml_file",
- "[CACHE]/builder/src/flutter/lib/web_ui/dev/goldens_lock.yaml",
- "--json_file",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/builder",
- "infra_step": true,
- "name": "read yaml.parse",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b6efc758\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
- "--path",
- "[CACHE]/builder/goldens",
- "--url",
- "repo"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "name": "git setup"
- },
- {
- "cmd": [
- "git",
- "fetch",
- "origin",
- "b6efc758",
- "--recurse-submodules",
- "--progress"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "env": {
- "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
- },
- "infra_step": true,
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "checkout",
- "-f",
- "FETCH_HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git checkout"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "read revision",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
- ]
- },
- {
- "cmd": [
- "git",
- "clean",
- "-f",
- "-d",
- "-x"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "git clean"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "sync"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule sync"
- },
- {
- "cmd": [
- "git",
- "submodule",
- "update",
- "--init",
- "--recursive"
- ],
- "cwd": "[CACHE]/builder/goldens",
- "infra_step": true,
- "name": "submodule update"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copytree",
- "[CACHE]/builder/goldens",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/goldens"
- ],
- "infra_step": true,
- "name": "copy goldens"
- },
- {
- "cmd": [
"python",
"-u",
"RECIPE_REPO[depot_tools]/gclient.py",
@@ -1252,45 +1086,6 @@
"name": "test: felt ios-safari test"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "tests for mac",
- "[CACHE]/builder/src/flutter/lib/web_ui/.dart_tool/test_results/info.txt"
- ],
- "cwd": "[CACHE]/builder/src/flutter/lib/web_ui",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "CHROME_NO_SANDBOX": "true",
- "ENGINE_PATH": "[CACHE]/builder",
- "FLUTTER_PREBUILT_DART_SDK": "True",
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "write info file",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@info.txt@tests for mac@@@",
- "@@@STEP_LOG_END@info.txt@@@"
- ]
- },
- {
"cmd": [],
"name": "Killing Processes"
},
diff --git a/recipes/web_engine_2_8_0.py b/recipes/web_engine_2_8_0.py
index b49fba1..d927d60 100644
--- a/recipes/web_engine_2_8_0.py
+++ b/recipes/web_engine_2_8_0.py
@@ -135,9 +135,6 @@
env, env_prefixes, api.properties.get('dependencies', [])
)
- if api.platform.is_mac:
- api.web_util.clone_goldens_repo(checkout)
-
with api.context(cwd=cache_root, env=env,
env_prefixes=env_prefixes), api.depot_tools.on_path():
@@ -230,7 +227,6 @@
api.step(
api.test_utils.test_step_name('felt ios-safari test'), felt_test
)
- api.web_util.upload_failing_goldens(checkout, 'ios-safari')
CleanUpProcesses(api)
else:
api.web_util.chrome(checkout)
@@ -248,7 +244,7 @@
# For running Chrome Unit tests:
command_name = 'chrome-unit-linux'
# These are the required dependencies.
- web_dependencies = ['chrome', 'goldens_repo']
+ web_dependencies = ['chrome']
# These are the felt commands which will be used.
command_args = ['test', '--browser=chrome']
addShardTask(
@@ -308,7 +304,6 @@
'required_driver_version': {'chrome': 84},
'chrome': {'Linux': '768968', 'Mac': '768985', 'Win': '768975'}
}
- golden_yaml_file = {'repository': 'repo', 'revision': 'b6efc758'}
yield api.test('linux-post-submit') + api.properties(
goma_jobs='200'
) + api.platform('linux', 64) + api.runtime(is_experimental=False)
@@ -320,13 +315,11 @@
) + api.runtime(is_experimental=False)
yield api.test(
'mac-post-submit',
- api.step_data('read yaml.parse', api.json.output(golden_yaml_file)),
api.properties(goma_jobs='200'), api.platform('mac', 64)
) + api.runtime(is_experimental=False)
yield api.test('linux-pre-submit') + api.properties(
goma_jobs='200',
git_url='https://mygitrepo',
git_ref='refs/pull/1/head',
- gcs_goldens_bucket='mybucket',
clobber=True
) + api.platform('linux', 64) + api.runtime(is_experimental=False)
