nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out 3 changesets (bug 1823453) for causing multiple failures on OS X WebRender Shippable. CLOSED TREE

Browse source 
Backed out changeset 30b8110bb48c (bug 1823453)
Backed out changeset f680b69dd013 (bug 1823453)
Backed out changeset 66ea50330124 (bug 1823453)
This commit is contained in:
Stanca Serban 2023-04-27 19:26:47 +03:00
parent 82030e5f73
commit e1b654cf9b
12 changed files with 6 additions and 143 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
python/mozbuild/mozbuild/artifacts.py
View file

@ -172,7 +172,7 @@ class ArtifactJob(object):
self._tests_re = None
if download_tests:
self._tests_re = re.compile(
r"public/(build|cidata)/(en-US/)?target\.common\.tests\.(zip|tar\.gz)$"
r"public/build/(en-US/)?target\.common\.tests\.(zip|tar\.gz)$"
)
self._maven_zip_re = None
if download_maven_zip:

62
taskcluster/ci/build/macosx.yml
View file

@ -384,58 +384,42 @@ macosx64-devedition/opt:
extract: false
dest: ../artifacts
- artifact: target.perftests.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.xpt_artifacts.zip
extract: false
dest: ../artifacts
- artifact: target.common.tests.tar.gz
prefix: public/cidata
dest: x64/common
- artifact: target.cppunittest.tests.tar.gz
prefix: public/cidata
dest: x64/cppunittest
- artifact: target.gtest.tests.tar.gz
prefix: public/cidata
dest: x64/gtest
- artifact: target.jittest.tests.tar.gz
prefix: public/cidata
dest: x64/jittest
- artifact: target.jsreftest.tests.tar.gz
prefix: public/cidata
dest: x64/jsreftest
- artifact: target.mochitest.tests.tar.gz
prefix: public/cidata
dest: x64/mochitest
- artifact: target.reftest.tests.tar.gz
prefix: public/cidata
dest: x64/reftest
- artifact: target.talos.tests.tar.gz
prefix: public/cidata
dest: x64/talos
- artifact: target.raptor.tests.tar.gz
prefix: public/cidata
dest: x64/raptor
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
dest: x64/confprof
- artifact: target.awsy.tests.tar.gz
prefix: public/cidata
dest: x64/awsy
- artifact: target.xpcshell.tests.tar.gz
prefix: public/cidata
dest: x64/xpcshell
- artifact: target.web-platform.tests.tar.gz
prefix: public/cidata
dest: x64/web-platform
- artifact: target.updater-dep.tests.tar.gz
prefix: public/cidata
dest: x64/updater-dep
- artifact: target.crashreporter-symbols.zip
dest: x64/crashreporter-symbols
- artifact: target.jsshell.zip
prefix: public/cidata
dest: x64/jsshell
- artifact: target.generated-files.tar.gz
extract: false
@ -451,51 +435,36 @@ macosx64-devedition/opt:
extract: false
dest: aarch64
- artifact: target.common.tests.tar.gz
prefix: public/cidata
dest: aarch64/common
- artifact: target.cppunittest.tests.tar.gz
prefix: public/cidata
dest: aarch64/cppunittest
- artifact: target.gtest.tests.tar.gz
prefix: public/cidata
dest: aarch64/gtest
- artifact: target.jittest.tests.tar.gz
prefix: public/cidata
dest: aarch64/jittest
- artifact: target.jsreftest.tests.tar.gz
prefix: public/cidata
dest: aarch64/jsreftest
- artifact: target.mochitest.tests.tar.gz
prefix: public/cidata
dest: aarch64/mochitest
- artifact: target.reftest.tests.tar.gz
prefix: public/cidata
dest: aarch64/reftest
- artifact: target.talos.tests.tar.gz
prefix: public/cidata
dest: aarch64/talos
- artifact: target.raptor.tests.tar.gz
prefix: public/cidata
dest: aarch64/raptor
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
dest: aarch64/confprof
- artifact: target.awsy.tests.tar.gz
prefix: public/cidata
dest: aarch64/awsy
- artifact: target.xpcshell.tests.tar.gz
prefix: public/cidata
dest: aarch64/xpcshell
- artifact: target.web-platform.tests.tar.gz
prefix: public/cidata
dest: aarch64/web-platform
- artifact: target.updater-dep.tests.tar.gz
prefix: public/cidata
dest: aarch64/updater-dep
- artifact: target.crashreporter-symbols.zip
dest: aarch64/crashreporter-symbols
- artifact: target.jsshell.zip
prefix: public/cidata
dest: aarch64/jsshell
toolchain:
- linux64-cctools-port
@ -745,58 +714,42 @@ macosx64-shippable/opt:
extract: false
dest: ../artifacts
- artifact: target.perftests.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.xpt_artifacts.zip
extract: false
dest: ../artifacts
- artifact: target.common.tests.tar.gz
prefix: public/cidata
dest: x64/common
- artifact: target.cppunittest.tests.tar.gz
prefix: public/cidata
dest: x64/cppunittest
- artifact: target.gtest.tests.tar.gz
prefix: public/cidata
dest: x64/gtest
- artifact: target.jittest.tests.tar.gz
prefix: public/cidata
dest: x64/jittest
- artifact: target.jsreftest.tests.tar.gz
prefix: public/cidata
dest: x64/jsreftest
- artifact: target.mochitest.tests.tar.gz
prefix: public/cidata
dest: x64/mochitest
- artifact: target.reftest.tests.tar.gz
prefix: public/cidata
dest: x64/reftest
- artifact: target.talos.tests.tar.gz
prefix: public/cidata
dest: x64/talos
- artifact: target.raptor.tests.tar.gz
prefix: public/cidata
dest: x64/raptor
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
dest: x64/confprof
- artifact: target.awsy.tests.tar.gz
prefix: public/cidata
dest: x64/awsy
- artifact: target.xpcshell.tests.tar.gz
prefix: public/cidata
dest: x64/xpcshell
- artifact: target.web-platform.tests.tar.gz
prefix: public/cidata
dest: x64/web-platform
- artifact: target.updater-dep.tests.tar.gz
prefix: public/cidata
dest: x64/updater-dep
- artifact: target.crashreporter-symbols.zip
dest: x64/crashreporter-symbols
- artifact: target.jsshell.zip
prefix: public/cidata
dest: x64/jsshell
- artifact: target.generated-files.tar.gz
extract: false
@ -812,51 +765,36 @@ macosx64-shippable/opt:
extract: false
dest: aarch64
- artifact: target.common.tests.tar.gz
prefix: public/cidata
dest: aarch64/common
- artifact: target.cppunittest.tests.tar.gz
prefix: public/cidata
dest: aarch64/cppunittest
- artifact: target.gtest.tests.tar.gz
prefix: public/cidata
dest: aarch64/gtest
- artifact: target.jittest.tests.tar.gz
prefix: public/cidata
dest: aarch64/jittest
- artifact: target.jsreftest.tests.tar.gz
prefix: public/cidata
dest: aarch64/jsreftest
- artifact: target.mochitest.tests.tar.gz
prefix: public/cidata
dest: aarch64/mochitest
- artifact: target.reftest.tests.tar.gz
prefix: public/cidata
dest: aarch64/reftest
- artifact: target.talos.tests.tar.gz
prefix: public/cidata
dest: aarch64/talos
- artifact: target.raptor.tests.tar.gz
prefix: public/cidata
dest: aarch64/raptor
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
dest: aarch64/confprof
- artifact: target.awsy.tests.tar.gz
prefix: public/cidata
dest: aarch64/awsy
- artifact: target.xpcshell.tests.tar.gz
prefix: public/cidata
dest: aarch64/xpcshell
- artifact: target.web-platform.tests.tar.gz
prefix: public/cidata
dest: aarch64/web-platform
- artifact: target.updater-dep.tests.tar.gz
prefix: public/cidata
dest: aarch64/updater-dep
- artifact: target.crashreporter-symbols.zip
dest: aarch64/crashreporter-symbols
- artifact: target.jsshell.zip
prefix: public/cidata
dest: aarch64/jsshell
toolchain:
- linux64-cctools-port

22
taskcluster/ci/build/windows.yml
View file

@ -1572,47 +1572,36 @@ win64-aarch64-shippable/opt:
extract: false
dest: ../artifacts
- artifact: target.common.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.cppunittest.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.mochitest.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.reftest.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.talos.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.raptor.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.awsy.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.xpcshell.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.web-platform.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.updater-dep.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.generated-files.tar.gz
@ -1739,47 +1728,36 @@ win64-aarch64-devedition/opt:
extract: false
dest: ../artifacts
- artifact: target.common.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.cppunittest.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.mochitest.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.reftest.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.talos.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.raptor.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.awsy.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.xpcshell.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.web-platform.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.updater-dep.tests.tar.gz
prefix: public/cidata
extract: false
dest: ../artifacts
- artifact: target.generated-files.tar.gz

3
taskcluster/ci/condprof/kind.yml
View file

@ -48,7 +48,6 @@ jobs:
fetches:
build:
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
- artifact: target.zip
toolchain:
- win64-geckodriver
@ -83,7 +82,6 @@ jobs:
fetches:
build:
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
- artifact: target.tar.bz2
toolchain:
- linux64-geckodriver
@ -117,7 +115,6 @@ jobs:
fetches:
build:
- artifact: target.condprof.tests.tar.gz
prefix: public/cidata
- artifact: target.dmg
extract: false
toolchain:

8
taskcluster/gecko_taskgraph/manifests/firefox_candidates.yml
View file

@ -129,13 +129,11 @@ mapping:
description: "Mixture of reftests, mochitests, UI and others, commonly bundled together in a test suite"
pretty_name: firefox-${version}.common.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.common.tests.tar.gz
prefix: public/cidata
target.cppunittest.tests.tar.gz:
<<: *default
description: "C++ unittests related in-tree test infrastructure"
pretty_name: firefox-${version}.cppunittest.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.cppunittest.tests.tar.gz
prefix: public/cidata
target.crashreporter-symbols.zip:
<<: *default
description: "Crashreporter symbols to be consumed by Socorro"
@ -151,7 +149,6 @@ mapping:
description: "Results for running the mochitest testing framework via Javascript function calls"
pretty_name: firefox-${version}.mochitest.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.mochitest.tests.tar.gz
prefix: public/cidata
target.mozinfo.json:
<<: *default
description: "Various compile and moz_app flags baked together in a json file"
@ -162,19 +159,16 @@ mapping:
description: "Results for running the reftest testing framework via display of two Web pages comparison"
pretty_name: firefox-${version}.reftest.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.reftest.tests.tar.gz
prefix: public/cidata
target.talos.tests.tar.gz:
<<: *default
description: "Results for running the talos testing framework to measure performance"
pretty_name: firefox-${version}.talos.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.talos.tests.tar.gz
prefix: public/cidata
target.awsy.tests.tar.gz:
<<: *default
description: "Results for running the awsy testing framework to track memory usage"
pretty_name: firefox-${version}.awsy.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.awsy.tests.tar.gz
prefix: public/cidata
target.test_packages.json:
<<: *default
description: "File containing metadata about all other files and testing harnesses specifics"
@ -185,13 +179,11 @@ mapping:
description: "Results for running the webplatform testing framework to cover standard Web platform features"
pretty_name: firefox-${version}.web-platform.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.web-platform.tests.tar.gz
prefix: public/cidata
target.xpcshell.tests.tar.gz:
<<: *default
description: "Results for running the xpcshell testing framework to enable XPConnect console application"
pretty_name: firefox-${version}.xpcshell.tests.tar.gz
checksums_path: ${path_platform}/${locale}/firefox-${version}.xpcshell.tests.tar.gz
prefix: public/cidata
target_info.txt:
<<: *default
description: "File containing the buildID"

8
taskcluster/gecko_taskgraph/manifests/firefox_nightly.yml
View file

@ -135,13 +135,11 @@ mapping:
description: "Mixture of reftests, mochitests, UI and others, commonly bundled together in a test suite"
pretty_name: firefox-${version}.${locale}.${filename_platform}.common.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.common.tests.tar.gz
prefix: public/cidata
target.cppunittest.tests.tar.gz:
<<: *default
description: "C++ unittests related in-tree test infrastructure"
pretty_name: firefox-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz
prefix: public/cidata
target.crashreporter-symbols.zip:
<<: *default
description: "Crashreporter symbols to be consumed by Socorro"
@ -160,7 +158,6 @@ mapping:
description: "Results for running the mochitest testing framework via Javascript function calls"
pretty_name: firefox-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz
prefix: public/cidata
target.mozinfo.json:
<<: *default
description: "Various compile and moz_app flags baked together in a json file"
@ -171,19 +168,16 @@ mapping:
description: "Results for running the reftest testing framework via display of two Web pages comparison"
pretty_name: firefox-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz
prefix: public/cidata
target.talos.tests.tar.gz:
<<: *default
description: "Results for running the talos testing framework to measure performance"
pretty_name: firefox-${version}.${locale}.${filename_platform}.talos.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.talos.tests.tar.gz
prefix: public/cidata
target.awsy.tests.tar.gz:
<<: *default
description: "Results for running the awsy testing framework to track memory usage"
pretty_name: firefox-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz
prefix: public/cidata
target.test_packages.json:
<<: *default
description: "File containing metadata about all other files and testing harnesses specifics"
@ -199,13 +193,11 @@ mapping:
description: "Results for running the webplatform testing framework to cover standard Web platform features"
pretty_name: firefox-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz
prefix: public/cidata
target.xpcshell.tests.tar.gz:
<<: *default
description: "Results for running the xpcshell testing framework to enable XPConnect console application"
pretty_name: firefox-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz
checksums_path: firefox-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz
prefix: public/cidata
target_info.txt:
<<: *default
description: "File containing the buildID"

6
taskcluster/gecko_taskgraph/transforms/artifact.py
View file

@ -68,7 +68,7 @@ def set_artifact_expiration(config, jobs):
)
if "artifacts" in job["worker"]:
plat = platform.lower()
if "plain" in plat or "fuzzing-ccov" in plat or "rusttest" in plat:
if "plain" in plat or "ccov" in plat or "rusttest" in plat:
art_dict = None
elif (
plat == "toolchain-wasm32-wasi-compiler-rt-trunk"
@ -77,8 +77,6 @@ def set_artifact_expiration(config, jobs):
or plat == "android-geckoview-docs"
):
art_dict = None
elif "ccov" in plat:
art_dict = {}
elif plat.startswith("win"):
art_dict = manifest["win"]
elif plat.startswith("linux"):
@ -103,8 +101,6 @@ def set_artifact_expiration(config, jobs):
artifact_dest = "cidata/{}"
if art_dict is not None:
art_dict.update(manifest["*"])
for art_name in art_dict.keys():
# The 'artifacts' key of a job is a list at this stage.
# So, must append a new dict to the list

19
taskcluster/gecko_taskgraph/transforms/artifacts.yml
View file

@ -1,23 +1,4 @@
---
'*':
target.awsy.tests.tar.gz: short
target.common.tests.tar.gz: short
target.condprof.tests.tar.gz: short
target.cppunittest.tests.tar.gz: short
target.fuzztest.tests.tar.gz: short
target.gtest.tests.tar.gz: short
target.jittest.tests.tar.gz: short
target.jsreftest.tests.tar.gz: short
target.mochitest.tests.tar.gz: short
target.perftests.tests.tar.gz: short
target.raptor.tests.tar.gz: short
target.reftest.tests.tar.gz: short
target.talos.tests.tar.gz: short
target.updater-dep.tests.tar.gz: short
target.web-platform.tests.tar.gz: short
target.xpcshell.tests.tar.gz: short
target.jsshell.zip: long
win:
target.crashreporter-symbols-full.tar.zst: shortest
sccache.log: shortest

8
taskcluster/gecko_taskgraph/transforms/job/__init__.py
View file

@ -86,7 +86,6 @@ job_description_schema = Schema(
Optional("dest"): str,
Optional("extract"): bool,
Optional("verify-hash"): bool,
Optional("prefix"): str,
},
],
},
@ -372,8 +371,6 @@ def use_fetches(config, jobs):
)
for artifact in artifacts:
artifact_prefix = prefix
if isinstance(artifact, str):
path = artifact
dest = None
@ -385,11 +382,8 @@ def use_fetches(config, jobs):
extract = artifact.get("extract", True)
verify_hash = artifact.get("verify-hash", False)
if "prefix" in artifact:
artifact_prefix = artifact["prefix"]
fetch = {
"artifact": f"{artifact_prefix}/{path}"
"artifact": f"{prefix}/{path}"
if not path.startswith("/")
else path[1:],
"task": f"<{kind}>",

6
taskcluster/gecko_taskgraph/util/scriptworker.py
View file

@ -479,7 +479,7 @@ def generate_beetmover_upstream_artifacts(
paths.append(
os.path.join(
file_config.get("prefix", base_artifact_prefix),
base_artifact_prefix,
jsone.render(file_config["source_path_modifier"], kwargs),
jsone.render(filename, kwargs),
)
@ -639,7 +639,7 @@ def generate_beetmover_artifact_map(config, job, **kwargs):
# Key must be artifact path, to avoid trampling duplicates, such
# as public/build/target.apk and public/build/en-US/target.apk
key = os.path.join(
file_config.get("prefix", base_artifact_prefix),
base_artifact_prefix,
file_config["source_path_modifier"],
filename,
)
@ -788,7 +788,7 @@ def generate_beetmover_partials_artifact_map(config, job, partials_info, **kwarg
# Key must be artifact path, to avoid trampling duplicates, such
# as public/build/target.apk and public/build/en-US/target.apk
key = os.path.join(
file_config.get("prefix", base_artifact_prefix),
base_artifact_prefix,
file_config["source_path_modifier"],
filename,
)

2
testing/mozharness/mozharness/mozilla/building/buildbase.py
View file

@ -1484,8 +1484,6 @@ items from that key's value."
platforms = yaml.safe_load(artfile.read())
for artifact in platforms[main_platform]:
arts.append(artifact)
for artifact in platforms["*"]:
arts.append(artifact)
except FileNotFoundError:
self.fatal("Could not read artifacts.yml; file not found. Exiting.")
except PermissionError:

3
testing/mozharness/mozharness/mozilla/testing/testbase.py
View file

@ -462,9 +462,6 @@ You can set this by specifying --test-url URL
unpack_dirs = None
url = self.query_build_dir_url(file_name)
if "en-US" not in url:
url = url.replace("public/build/", "public/cidata/")
self.download_unpack(url, target_dir, extract_dirs=unpack_dirs)
def _download_test_zip(self, extract_dirs=None):