Bug 1342488 - Run the linux64-qr test platforms using the regular linux64 build platform, and remove the linux64-qr build platform. r=dustin
MozReview-Commit-ID: 1zrGgWNYwQ9
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -428,68 +428,16 @@ linux64-add-on-devel/opt:
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
secrets: true
custom-build-variant-cfg: add-on-devel
tooltool-downloads: public
need-xvfb: true
run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]
-linux64-qr/debug:
- description: "Linux64 Debug QuantumRender"
- index:
- product: firefox
- job-name: linux64-qr-debug
- treeherder:
- platform: linux64-qr/debug
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- implementation: docker-worker
- max-run-time: 36000
- run:
- using: mozharness
- actions: [get-secrets build check-test update]
- config:
- - builds/releng_base_linux_64_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- custom-build-variant-cfg: qr-debug
- tooltool-downloads: public
- need-xvfb: true
- run-on-projects: [ 'autoland', 'mozilla-inbound', 'mozilla-central', 'graphics' ]
-
-linux64-qr/opt:
- description: "Linux64 Opt QuantumRender"
- index:
- product: firefox
- job-name: linux64-qr-opt
- treeherder:
- platform: linux64-qr/opt
- symbol: tc(B)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- implementation: docker-worker
- max-run-time: 36000
- run:
- using: mozharness
- actions: [get-secrets build check-test update]
- config:
- - builds/releng_base_linux_64_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- custom-build-variant-cfg: qr-opt
- tooltool-downloads: public
- need-xvfb: true
- run-on-projects: [ 'autoland', 'mozilla-inbound', 'mozilla-central', 'graphics' ]
-
linux-qr/opt:
description: "Linux32 Opt QuantumRender"
index:
product: firefox
job-name: linux-qr-opt
treeherder:
platform: linux32-qr/opt
symbol: tc(B)
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -89,21 +89,21 @@ linux64-stylo-sequential/opt:
test-sets:
- stylo-sequential-tests
- talos
# QR builds just run a subset right now. Note that the tests in this
# test set are further restricted in tests.yml to run on certain projects
# only, to avoid adding too much infra load.
linux64-qr/opt:
- build-platform: linux64-qr/opt
+ build-platform: linux64/opt
test-sets:
- qr-tests
linux64-qr/debug:
- build-platform: linux64-qr/debug
+ build-platform: linux64/debug
test-sets:
- qr-tests
linux64-ccov/opt:
build-platform: linux64-ccov/opt
test-sets:
- ccov-code-coverage-tests
linux64-jsdcov/opt:
--- a/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
+++ b/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
@@ -34,18 +34,16 @@ JOB_NAME_WHITELIST = set([
'linux64-asan-opt',
'linux64-ccov-opt',
'linux64-clang-tidy',
'linux64-debug',
'linux64-devedition',
'linux64-jsdcov-opt',
'linux64-opt',
'linux64-pgo',
- 'linux64-qr-debug',
- 'linux64-qr-opt',
'linux64-st-an-debug',
'linux64-st-an-opt',
'linux64-stylo-debug',
'linux64-stylo-opt',
'linux64-valgrind-opt',
'macosx64-add-on-devel',
'macosx64-clang-tidy',
'macosx64-debug',