diff options
Diffstat (limited to '')
| -rw-r--r-- | taskcluster/ci/config.yml | 9 | ||||
| -rw-r--r-- | taskcluster/ci/fetch/toolchains.yml | 9 | ||||
| -rw-r--r-- | taskcluster/ci/test/awsy.yml | 2 | ||||
| -rw-r--r-- | taskcluster/ci/test/compiled.yml | 2 | ||||
| -rw-r--r-- | taskcluster/ci/test/mochitest.yml | 40 | ||||
| -rw-r--r-- | taskcluster/ci/test/variants.yml | 2 | ||||
| -rw-r--r-- | taskcluster/ci/test/web-platform.yml | 61 | ||||
| -rw-r--r-- | taskcluster/ci/test/xpcshell.yml | 6 |
8 files changed, 26 insertions, 105 deletions
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml index 7be6ba9a28..c847e281b8 100644 --- a/taskcluster/ci/config.yml +++ b/taskcluster/ci/config.yml @@ -599,11 +599,16 @@ workers: implementation: docker-worker os: linux worker-type: '{alias}-gcp' + t-linux(-large|-xlarge|-xlarge-source)-noscratch: + provisioner: '{trust-domain}-t' + implementation: docker-worker + os: linux + worker-type: '{alias}-gcp' t-linux-kvm: provisioner: '{trust-domain}-t' implementation: docker-worker os: linux - worker-type: 't-linux-kvm-gcp' + worker-type: 't-linux-kvm-noscratch-gcp' t-linux-kvm-aws: provisioner: '{trust-domain}-t' implementation: docker-worker @@ -646,7 +651,7 @@ workers: default: '{trust-domain}-t' implementation: docker-worker os: linux - worker-type: 't-linux-xlarge-gcp' + worker-type: 't-linux-xlarge-noscratch-gcp' b-osx-1015: provisioner: releng-hardware implementation: generic-worker diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index 76c6cf04fc..84833480e0 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -150,15 +150,14 @@ nasm-2.15.05: size: 995732 wix-3.14.0: - description: wix 3.14.0.2812 binary release + description: wix 3.14.0 binary release # WIX doesn't use a wrapping toplevel DIR, so we should really repackage it when # Bug 1479533 and related code is ready. fetch: type: static-url - # This is a dev version of the toolset, upstream will purge over time... - url: http://wixtoolset.org/downloads/v3.14.0.2812/wix314-binaries.zip - sha256: 923892298f37514622c58cbbd9c2cadf2822d9bb53df8ee83aaeb05280777611 - size: 34664320 + url: https://github.com/wixtoolset/wix3/releases/download/wix314rtm/wix314-binaries.zip + sha256: 13f067f38969faf163d93a804b48ea0576790a202c8f10291f2000f0e356e934 + size: 41282726 zlib-1.2.13: description: zlib 1.2.13 source code diff --git a/taskcluster/ci/test/awsy.yml b/taskcluster/ci/test/awsy.yml index e730460b35..d5c918b75f 100644 --- a/taskcluster/ci/test/awsy.yml +++ b/taskcluster/ci/test/awsy.yml @@ -5,7 +5,7 @@ job-defaults: suite: awsy max-run-time: 7200 - instance-size: xlarge + instance-size: xlarge-noscratch virtualization: by-test-platform: windows.*(?:-shippable)?-qr/.*: virtual-with-gpu diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml index 864e1ca6c4..b625613522 100644 --- a/taskcluster/ci/test/compiled.yml +++ b/taskcluster/ci/test/compiled.yml @@ -52,7 +52,7 @@ gtest: description: "GTests run" suite: gtest treeherder-symbol: GTest - instance-size: xlarge + instance-size: xlarge-noscratch run-on-projects: by-variant: 1proc: diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml index b4439a6e47..dd5d08c79d 100644 --- a/taskcluster/ci/test/mochitest.yml +++ b/taskcluster/ci/test/mochitest.yml @@ -58,8 +58,6 @@ mochitest-plain: - xorigin - no-fission - socketprocess_networking - - webrender-sw+no-fission - - webrender-sw - headless - headless+socketprocess_networking - http3 @@ -85,16 +83,6 @@ mochitest-plain: .*(asan|ccov|wayland).*: [] (linux.*64|macosx.*64|windows11-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central'] default: [] - webrender-sw+no-fission: - by-test-platform: - android-em-7.0-x86_64-qr/debug: built-projects - linux.*asan.*: ['trunk'] - linux.*64(-shippable)?-qr/(opt|debug): ['trunk'] - default: [] - webrender-sw: - by-test-platform: - linux1804-64-qr/debug: built-projects - default: [] aab+no-fission: by-test-platform: android-em-7.0-x86_64-qr/debug: built-projects @@ -142,7 +130,7 @@ mochitest-plain: default: 5 instance-size: by-test-platform: - linux.*64-tsan-qr/opt: xlarge # runs out of memory using 8GB + linux.*64-tsan-qr/opt: xlarge-noscratch # runs out of memory using 8GB default: default max-run-time: 5400 allow-software-gl-layers: false @@ -239,7 +227,6 @@ mochitest-browser-chrome: linux.*64-shippable-qr/opt: ['release'] linux.*64(-shippable)?-qr/opt: built-projects linux.*64-devedition-qr/opt: built-projects - windows1.*-64.*-qr/debug: built-projects default: [] webrender-sw+a11y-checks: by-test-platform: @@ -306,7 +293,7 @@ mochitest-browser-chrome: # Bug 1281241: migrating to m3.large instances instance-size: by-test-platform: - linux.*64-tsan-qr/opt: xlarge # runs out of memory using 8GB + linux.*64-tsan-qr/opt: xlarge-noscratch # runs out of memory using 8GB default: default allow-software-gl-layers: false @@ -434,7 +421,7 @@ mochitest-chrome: chunked: true instance-size: by-test-platform: - linux.*64-tsan-qr/opt: xlarge # runs out of memory otherwise using 8GB + linux.*64-tsan-qr/opt: xlarge-noscratch # runs out of memory otherwise using 8GB default: default mochitest-devtools-chrome: @@ -447,7 +434,6 @@ mochitest-devtools-chrome: variants: - a11y-checks - socketprocess_networking - - webrender-sw - devtools-no-eft+no-fission - http3 run-on-projects: @@ -470,10 +456,6 @@ mochitest-devtools-chrome: .*ccov.*: [] (linux.*64|macosx.*64|windows.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central'] default: [] - webrender-sw: - by-test-platform: - linux.*64-qr/debug: built-projects - default: [] default: by-test-platform: android.*: [] @@ -501,7 +483,7 @@ mochitest-devtools-chrome: chunked: true instance-size: by-test-platform: - linux.*64-[at]san(-qr)?/opt: xlarge # runs out of memory otherwise using 8GB + linux.*64-[at]san(-qr)?/opt: xlarge-noscratch # runs out of memory otherwise using 8GB default: default # Bug 1296086: high number of intermittents observed with software GL and large instances allow-software-gl-layers: false @@ -585,7 +567,7 @@ mochitest-plain-gpu: - --mochitest-suite=mochitest-plain-gpu instance-size: by-test-platform: - linux.*64-tsan-qr/opt: xlarge # runs out of memory otherwise using 8GB + linux.*64-tsan-qr/opt: xlarge-noscratch # runs out of memory otherwise using 8GB default: default mochitest-chrome-gpu: @@ -625,7 +607,7 @@ mochitest-chrome-gpu: - --mochitest-suite=mochitest-chrome-gpu instance-size: by-test-platform: - linux.*64-tsan-qr/opt: xlarge # runs out of memory using 8GB of memory + linux.*64-tsan-qr/opt: xlarge-noscratch # runs out of memory using 8GB of memory default: default mochitest-media: @@ -1053,8 +1035,6 @@ mochitest-remote: variants: - no-fission - socketprocess_networking - - webrender-sw+no-fission - - webrender-sw run-on-projects: by-variant: socketprocess_networking: @@ -1063,14 +1043,6 @@ mochitest-remote: .*ccov.*: [] (linux.*64|macosx.*64|windows1.*-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central'] default: [] - webrender-sw+no-fission: - by-test-platform: - linux.*64-qr/debug: ['trunk'] - default: [] - webrender-sw: - by-test-platform: - linux.*64-qr/debug: ['all'] - default: [] no-fission: by-test-platform: linux1804-64-qr/debug: ['trunk'] diff --git a/taskcluster/ci/test/variants.yml b/taskcluster/ci/test/variants.yml index 9777cc3cec..7255f0bc5f 100644 --- a/taskcluster/ci/test/variants.yml +++ b/taskcluster/ci/test/variants.yml @@ -222,7 +222,7 @@ webrender-dcomp-compositing: webrender-sw: description: "{description} with software webrender enabled" component: "Core::Graphics: WebRender" - expiration: "2023-09-01" + expiration: "never" suffix: "swr" merge: webrender: true diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml index cea5f5e3e6..75fcc14ef3 100644 --- a/taskcluster/ci/test/web-platform.yml +++ b/taskcluster/ci/test/web-platform.yml @@ -5,7 +5,7 @@ job-defaults: suite: category: web-platform-tests - instance-size: xlarge + instance-size: xlarge-noscratch max-run-time: by-test-platform: android-em-7.0-x86_64/debug: 7200 @@ -63,24 +63,8 @@ web-platform-tests: default: 7200 variants: - no-fission - - webrender-sw+no-fission - - webrender-sw - - editor-legacy-direction run-on-projects: by-variant: - webrender-sw: - by-test-platform: - .*-32.*/.*: [] - linux.*64-qr/debug: built-projects - windows.*-qr/debug: built-projects - android-em-7.0-x86_64-qr/debug: [] - default: [] - webrender-sw+no-fission: - by-test-platform: - .*-32.*/.*: [] - android-em-7.0-x86_64-qr/debug: built-projects - linux.*64-qr/debug: built-projects - default: [] no-fission: by-test-platform: android-em-7.0-x86_64-qr/debug-isolated-process: [] @@ -88,10 +72,6 @@ web-platform-tests: linux1804-64-qr/debug: ['trunk'] linux1804-64(-shippable|-asan)?-qr/opt: ['trunk'] default: [] - editor-legacy-direction: - by-test-platform: - linux1804-64-qr/debug: ['mozilla-central'] - default: [] default: by-test-platform: android.*: [] @@ -164,23 +144,8 @@ web-platform-tests-reftest: default: 4 variants: - no-fission - - webrender-sw+no-fission - - webrender-sw - - editor-legacy-direction run-on-projects: by-variant: - webrender-sw: - by-test-platform: - .*-32.*/.*: [] - linux.*64-qr/debug: built-projects - windows.*-qr/debug: built-projects - default: [] - webrender-sw+no-fission: - by-test-platform: - android-em-7.0-x86_64-qr/debug: built-projects - linux1804-64-qr/debug: ['trunk'] - linux1804-64(-shippable|-asan)?-qr/opt: ['trunk'] - default: [] no-fission: by-test-platform: android-em-7.0-x86_64-qr/debug-isolated-process: [] @@ -188,10 +153,6 @@ web-platform-tests-reftest: linux1804-64(-shippable|-asan)?-qr/opt: ['trunk'] android.*: built-projects default: [] - editor-legacy-direction: - by-test-platform: - linux1804-64-qr/debug: ['mozilla-central'] - default: [] default: by-test-platform: android.*: [] @@ -276,25 +237,9 @@ web-platform-tests-wdspec: - --test-type=wdspec variants: - no-fission - - webrender-sw+no-fission - - webrender-sw - headless - - editor-legacy-direction run-on-projects: by-variant: - webrender-sw+no-fission: - by-test-platform: - android-em-7.0-x86_64-qr/debug: built-projects - linux1804-64-qr/debug: ['trunk'] - linux1804-64(-shippable|-asan)?-qr/opt: ['trunk'] - default: [] - webrender-sw: - by-test-platform: - android-em-7.0-x86_64-qr/debug: [] - .*-32.*/.*: [] - linux.*64-qr/debug: built-projects - windows.*-qr/debug: built-projects - default: [] headless: by-test-platform: android.*: [] @@ -306,10 +251,6 @@ web-platform-tests-wdspec: linux1804-64(-shippable|-asan)?-qr/opt: ['trunk'] android.*: built-projects default: [] - editor-legacy-direction: - by-test-platform: - linux1804-64-qr/debug: ['mozilla-central'] - default: [] default: by-test-platform: android.*: [] diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml index 583155eb25..d01228d7ac 100644 --- a/taskcluster/ci/test/xpcshell.yml +++ b/taskcluster/ci/test/xpcshell.yml @@ -51,6 +51,10 @@ xpcshell: - socketprocess_networking - no-fission - msix + instance-size: + by-variant: + conditioned_profile: large + default: large-noscratch run-on-projects: by-variant: conditioned_profile: @@ -90,7 +94,7 @@ xpcshell: by-test-platform: .*-asan-qr/opt: 4 .*-ccov.*/.*: 8 - .*-tsan-qr/opt: 8 + .*-tsan-qr/opt: 10 (android-em-7.*|macosx.*|linux1804-64.*/opt): 2 default: 4 max-run-time: |