Skip to content

Commit 0452b41

Browse files
author
Stanca Serban
committed
Backed out changeset 148252770707 (bug 1837000) as requested for making some corrections to the pool config.
1 parent 9d049ad commit 0452b41

File tree

14 files changed

+24
-29
lines changed

14 files changed

+24
-29
lines changed

taskcluster/ci/build/windows.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ win64-plain/debug:
311311
platform: windows2012-64/debug
312312
symbol: Bp
313313
tier: 1
314-
worker-type: b-win2022
314+
worker-type: b-win2012
315315
worker:
316316
max-run-time: 7200
317317
env:
@@ -403,7 +403,7 @@ win64-plain/opt:
403403
platform: windows2012-64/opt
404404
symbol: Bp
405405
tier: 1
406-
worker-type: b-win2022
406+
worker-type: b-win2012
407407
worker:
408408
max-run-time: 7200
409409
env:
@@ -792,7 +792,7 @@ win32-rusttests/opt:
792792
platform: windows2012-32/opt
793793
symbol: BR
794794
tier: 1
795-
worker-type: b-win2022
795+
worker-type: b-win2012
796796
worker:
797797
max-run-time: 5400
798798
env:
@@ -837,7 +837,7 @@ win32-rusttests/debug:
837837
platform: windows2012-32/debug
838838
symbol: BR
839839
tier: 1
840-
worker-type: b-win2022
840+
worker-type: b-win2012
841841
worker:
842842
max-run-time: 5400
843843
env:
@@ -882,7 +882,7 @@ win64-rusttests/opt:
882882
platform: windows2012-64/opt
883883
symbol: BR
884884
tier: 1
885-
worker-type: b-win2022
885+
worker-type: b-win2012
886886
worker:
887887
max-run-time: 5400
888888
env:
@@ -924,7 +924,7 @@ win64-rusttests/debug:
924924
platform: windows2012-64/debug
925925
symbol: BR
926926
tier: 1
927-
worker-type: b-win2022
927+
worker-type: b-win2012
928928
worker:
929929
max-run-time: 5400
930930
env:
@@ -968,7 +968,7 @@ win64-ccov/opt:
968968
platform: windows2012-64/ccov
969969
symbol: B
970970
tier: 2
971-
worker-type: b-win2022
971+
worker-type: b-win2012
972972
worker:
973973
artifacts:
974974
- name: public/code-coverage-grcov.zip
@@ -1015,7 +1015,7 @@ win64-fuzzing-ccov/opt:
10151015
treeherder:
10161016
platform: windows2012-64/ccov
10171017
symbol: Bocf
1018-
worker-type: b-win2022
1018+
worker-type: b-win2012
10191019
worker:
10201020
artifacts:
10211021
- name: public/code-coverage-grcov.zip

taskcluster/ci/condprof/kind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ job-defaults:
3232
use-system-python: false
3333
jobs:
3434
windows2012-64-firefox:
35-
worker-type: b-win2022
35+
worker-type: b-win2012
3636
description: Creates or updates conditioned profiles on Win64
3737
run-on-projects: ['mozilla-central']
3838
treeherder:

taskcluster/ci/config.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,6 @@ workers:
505505
implementation: generic-worker
506506
os: windows
507507
worker-type: '{alias}-azure'
508-
b-win2022:
509-
provisioner: '{trust-domain}-{level}'
510-
implementation: generic-worker
511-
os: windows
512-
worker-type: '{alias}'
513508
image:
514509
provisioner: '{trust-domain}-{level}'
515510
implementation: docker-worker

taskcluster/ci/generate-profile/kind.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
job-name: win32-profile
174174
treeherder:
175175
platform: windows2012-32-shippable/opt
176-
worker-type: b-win2022
176+
worker-type: b-win2012
177177
worker:
178178
chain-of-trust: true
179179
max-run-time: 2400
@@ -202,7 +202,7 @@ jobs:
202202
job-name: win64-profile
203203
treeherder:
204204
platform: windows2012-64-shippable/opt
205-
worker-type: b-win2022
205+
worker-type: b-win2012
206206
worker:
207207
chain-of-trust: true
208208
max-run-time: 2400

taskcluster/ci/openh264-plugin/kind.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
build_type: opt
157157
treeherder:
158158
platform: win32/opt
159-
worker-type: b-win2022
159+
worker-type: b-win2012
160160
worker:
161161
max-run-time: 1800
162162
artifacts:
@@ -181,7 +181,7 @@ jobs:
181181
build_type: opt
182182
treeherder:
183183
platform: win64/opt
184-
worker-type: b-win2022
184+
worker-type: b-win2012
185185
worker:
186186
max-run-time: 1800
187187
artifacts:
@@ -206,7 +206,7 @@ jobs:
206206
build_type: opt
207207
treeherder:
208208
platform: win64-aarch64/opt
209-
worker-type: b-win2022
209+
worker-type: b-win2012
210210
worker:
211211
max-run-time: 1800
212212
artifacts:

taskcluster/ci/repackage-msi/kind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ only-for-build-platforms:
2222
- win64-devedition/opt
2323

2424
job-template:
25-
worker-type: 'b-win2022'
25+
worker-type: 'b-win2012'
2626
mozharness:
2727
use-magic-mh-args: false
2828
config:

taskcluster/ci/spidermonkey/kind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ job-defaults:
5959
fetches:
6060
toolchain:
6161
by-worker-type:
62-
.*-b-win2022:
62+
.*-b-win2012:
6363
- win64-clang
6464
- win64-rust
6565
default:

taskcluster/ci/spidermonkey/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44
---
55
job-defaults:
6-
worker-type: b-win2022
6+
worker-type: b-win2012
77
worker:
88
max-run-time: 10800
99
run:

taskcluster/ci/static-analysis-autotest/kind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
treeherder:
7777
platform: windows2012-64/debug
7878
tier: 2
79-
worker-type: b-win2022
79+
worker-type: b-win2012
8080
run:
8181
config:
8282
- builds/releng_base_firefox.py

taskcluster/ci/toolchain/clang.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ win64-clang-16-raw:
427427
description: "Clang-cl 16 toolchain build"
428428
treeherder:
429429
symbol: TW64(clang-16-raw)
430-
worker-type: b-win2022
430+
worker-type: b-win2012
431431
worker:
432432
max-run-time: 9000
433433
run:
@@ -839,7 +839,7 @@ win64-clang-trunk-raw:
839839
cached_task: false
840840
treeherder:
841841
symbol: TW64(clang-trunk-raw)
842-
worker-type: b-win2022
842+
worker-type: b-win2012
843843
worker:
844844
max-run-time: 9000
845845
run:

taskcluster/ci/toolchain/gn.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ macosx64-gn:
3737
win64-gn:
3838
treeherder:
3939
symbol: TW64(gn)
40-
worker-type: b-win2022
40+
worker-type: b-win2012
4141
worker:
4242
max-run-time: 3600
4343
run:

taskcluster/ci/toolchain/misc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ win64-custom-car:
242242
description: "Custom chromium-as-release build for Windows"
243243
treeherder:
244244
symbol: TW64(custom-car)
245-
worker-type: b-win2022
245+
worker-type: b-win2012
246246
worker:
247247
max-run-time: 16200
248248
env:

taskcluster/ci/updatebot/kind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
platform: updatebot/all
5959
symbol: w-cron
6060
tier: 1
61-
worker-type: b-win2022
61+
worker-type: b-win2012
6262
worker:
6363
max-run-time: 3600
6464
taskcluster-proxy: true

taskcluster/gecko_taskgraph/transforms/l10n.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ def make_job_description(config, jobs):
379379
"max-run-time": job["run-time"],
380380
"chain-of-trust": True,
381381
}
382-
if job["worker-type"] in ["b-win2012", "b-win2022"]:
382+
if job["worker-type"] == "b-win2012":
383383
job_description["worker"]["os"] = "windows"
384384
job_description["run"]["use-simple-package"] = False
385385
job_description["run"]["use-magic-mh-args"] = False

0 commit comments

Comments
 (0)