From 631c99534f48a3bf0df5734f803b18fdc0c6bfc8 Mon Sep 17 00:00:00 2001
From: Justin Wood <Callek@gmail.com>
Date: Wed, 27 Mar 2019 13:45:03 +0000
Subject: [PATCH] Bug 1352113 - Shippable Builds - Remove windows pgo entirely.
 r=jmaher,aki

Differential Revision: https://phabricator.services.mozilla.com/D23125

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/build/windows.yml       | 70 --------------------------
 taskcluster/ci/test/test-platforms.yml | 32 ------------
 2 files changed, 102 deletions(-)

diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index ae10c5eeb4e0..c552e426ba9f 100755
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -74,41 +74,6 @@ win32/opt:
         - win64-nasm
         - win64-node
 
-win32/pgo:
-    description: "Win32 Opt PGO"
-    index:
-        product: firefox
-        job-name: win32-pgo
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: windows2012-32/pgo
-        symbol: B
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
-    worker:
-        max-run-time: 9000
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
-    run:
-        options: [enable-pgo, append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        config:
-            - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win32.py
-        extra-config:
-            stage_platform: win32
-    toolchains:
-        - win64-clang-cl
-        - win64-rust
-        - win64-rust-size
-        - win64-cbindgen
-        - win64-sccache
-        - win64-nasm
-        - win64-node
-
 win64/debug:
     description: "Win64 Debug"
     index:
@@ -460,41 +425,6 @@ win64-nightly/opt:
         - win64-nasm
         - win64-node
 
-win64/pgo:
-    description: "Win64 Opt PGO"
-    index:
-        product: firefox
-        job-name: win64-pgo
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: windows2012-64/pgo
-        symbol: B
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
-    worker:
-        max-run-time: 10800
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
-    run:
-        options: [enable-pgo, append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        config:
-            - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
-        extra-config:
-            stage_platform: win64
-    toolchains:
-        - win64-clang-cl
-        - win64-rust
-        - win64-rust-size
-        - win64-cbindgen
-        - win64-sccache
-        - win64-nasm
-        - win64-node
-
 win32-add-on-devel/opt:
     description: "Windows32 add-on-devel"
     index:
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 5f3456747c1e..69992b282a36 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -192,17 +192,6 @@ windows7-32/opt:
         - web-platform-tests
         - raptor-firefox
 
-windows7-32-pgo/opt:
-    build-platform: win32-pgo/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        - windows-reftest-gpu
-        - windows-talos
-        - windows-tests
-        - web-platform-tests
-        - raptor-firefox
-
 windows7-32-nightly/opt:
     build-platform: win32-nightly/opt
     test-sets:
@@ -284,18 +273,6 @@ windows10-64-ux/opt:
         - raptor-firefox
         - talos-ux
 
-windows10-64-pgo/opt:
-    build-platform: win64-pgo/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        - windows-talos
-        - marionette-gpu-tests
-        - windows-tests
-        - web-platform-tests
-        - mochitest-headless
-        - raptor-firefox
-
 windows10-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
@@ -352,15 +329,6 @@ windows10-64-qr/opt:
         - raptor-firefox
         - web-platform-tests
 
-windows10-64-pgo-qr/opt:
-    build-platform: win64-pgo/opt
-    test-sets:
-        - awsy
-        - windows-qr-tests
-        - windows-talos
-        - raptor-firefox
-        - web-platform-tests
-
 windows10-64-shippable-qr/opt:
     build-platform: win64-shippable/opt
     test-sets: