diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-12-10 10:04:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 10:04:46 -0500 |
| commit | f4acea3dfa563640b801f77b860253137ee3cbbf (patch) | |
| tree | 40aed8625cc465155d0bc5383076b819e214c99a | |
| parent | 4d5bf653f72a4ebf02c627eda7c5fa7f3744cbe8 (diff) | |
| parent | 648de3984a2f038e68263f54a0f7dbc1d5c0ce8b (diff) | |
| download | servo-f4acea3dfa563640b801f77b860253137ee3cbbf.tar.gz servo-f4acea3dfa563640b801f77b860253137ee3cbbf.zip | |
Auto merge of #25163 - servo:treeherder, r=nox
Make tasks easier to find in Treeherder
| -rw-r--r-- | etc/taskcluster/decision_task.py | 20 | ||||
| -rw-r--r-- | etc/taskcluster/decisionlib.py | 3 |
2 files changed, 12 insertions, 11 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 3ed715511e5..21789d2442b 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -318,7 +318,7 @@ def with_rust_nightly(): def android_arm32_dev_from_macos(): return ( macos_build_task("Dev build (macOS)") - .with_treeherder("Android ARMv7") + .with_treeherder("Android ARMv7", "Dev(macOS)") .with_script(""" export HOST_CC="$(brew --prefix llvm)/bin/clang" export HOST_CXX="$(brew --prefix llvm)/bin/clang++" @@ -332,7 +332,7 @@ def android_arm32_dev_from_macos(): def android_arm32_dev(): return ( android_build_task("Dev build") - .with_treeherder("Android ARMv7") + .with_treeherder("Android ARMv7", "Dev") .with_script(""" ./mach build --android --dev ./etc/ci/lockfile_changed.sh @@ -345,7 +345,7 @@ def android_arm32_dev(): def android_nightly(): return ( android_build_task("Nightly build and upload") - .with_treeherder("Android Nightlies") + .with_treeherder("Android", "Nightlies") .with_features("taskclusterProxy") .with_scopes("secrets:get:project/servo/s3-upload-credentials") .with_script(""" @@ -396,7 +396,7 @@ def android_x86_wpt(): build_task = android_x86_release() task = ( linux_task("WPT") - .with_treeherder("Android x86") + .with_treeherder("Android x86", "WPT") .with_provisioner_id("proj-servo") .with_worker_type("docker-worker-kvm") .with_capabilities(privileged=True) @@ -434,7 +434,7 @@ def appx_artifact(debug): def windows_arm64(): return ( windows_build_task("UWP dev build", arch="arm64", package=False) - .with_treeherder("Windows arm64") + .with_treeherder("Windows arm64", "UWP-Dev") .with_script( "python mach build --dev --target=aarch64-uwp-windows-msvc", "python mach package --dev --target aarch64-uwp-windows-msvc --uwp=arm64", @@ -447,7 +447,7 @@ def windows_arm64(): def windows_uwp_x64(): return ( windows_build_task("UWP dev build", package=False) - .with_treeherder("Windows x64") + .with_treeherder("Windows x64", "UWP-Dev") .with_script( "python mach build --dev --target=x86_64-uwp-windows-msvc", "python mach package --dev --target=x86_64-uwp-windows-msvc --uwp=x64", @@ -461,7 +461,7 @@ def windows_uwp_x64(): def uwp_nightly(): return ( windows_build_task("Nightly UWP build and upload", package=False) - .with_treeherder("Windows x64", "UWP Nightly") + .with_treeherder("Windows x64", "UWP-Nightly") .with_features("taskclusterProxy") .with_scopes("secrets:get:project/servo/s3-upload-credentials") .with_script( @@ -584,7 +584,7 @@ def update_wpt(): build_task = linux_release_build_with_debug_assertions(layout_2020=False) return ( linux_task("WPT update") - .with_treeherder("Linux x64", "WPT update") + .with_treeherder("Linux x64", "WPT-update") .with_dockerfile(dockerfile_path("wpt-update")) .with_features("taskclusterProxy") .with_scopes("secrets:get:project/servo/wpt-sync") @@ -628,13 +628,15 @@ def linux_release_build_with_debug_assertions(layout_2020): name_prefix = "Layout 2020 " build_args = "--with-layout-2020" index_key_suffix = "_2020" + treeherder_prefix = "2020-" else: name_prefix = "" build_args = "" index_key_suffix = "" + treeherder_prefix = "" return ( linux_build_task(name_prefix + "Release build, with debug assertions") - .with_treeherder("Linux x64", "Release+A") + .with_treeherder("Linux x64", treeherder_prefix + "Release+A") .with_script(""" time ./mach rustc -V time ./mach fetch diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py index dd277001b0c..b8d878da9d8 100644 --- a/etc/taskcluster/decisionlib.py +++ b/etc/taskcluster/decisionlib.py @@ -172,8 +172,7 @@ class Task: self.treeherder_required = True return self - def with_treeherder(self, category, symbol=None): - symbol = symbol or self.name + def with_treeherder(self, category, symbol): assert len(symbol) <= 25, symbol self.name = "%s: %s" % (category, self.name) |