From 8d5aee0562404c720dc2a8ba5be06104dd3b22cd Mon Sep 17 00:00:00 2001
From: Zain Rizvi <ZainRizvi@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:49:57 -0500
Subject: [PATCH 1/2] Use the default runner type

During the Linux Amazon 2023 AMI (base OS) migration these jobs had been temporarily shifted to use the new experimental AMI.

Now that the new AMI has become the base AMI, shifting these back to use the default runners
---
 .github/workflows/docker-build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 54db85d7af1..aadccaafb33 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -56,7 +56,7 @@ jobs:
     env:
       REPOSITORY: ${{ github.repository }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-    runs-on: amz2023.linux.4xlarge
+    runs-on: linux.4xlarge
     steps:
       - name: Clean workspace
         run: |
@@ -116,7 +116,7 @@ jobs:
     env:
       REPOSITORY: ${{ github.repository }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-    runs-on: amz2023.linux.12xlarge
+    runs-on: linux.12xlarge
     steps:
       - name: Clean workspace
         run: |
@@ -176,7 +176,7 @@ jobs:
     env:
       REPOSITORY: ${{ github.repository }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-    runs-on: amz2023.linux.4xlarge
+    runs-on: linux.4xlarge
     steps:
       - name: Clean workspace
         run: |
@@ -236,7 +236,7 @@ jobs:
     env:
       REPOSITORY: ${{ github.repository }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-    runs-on: amz2023.linux.12xlarge
+    runs-on: linux.12xlarge
     steps:
       - name: Clean workspace
         run: |

From fd176d6c5c3caf929375af1b75fdb83fac481da0 Mon Sep 17 00:00:00 2001
From: Zain Rizvi <ZainR@meta.com>
Date: Fri, 13 Sep 2024 16:54:17 -0500
Subject: [PATCH 2/2] More runner fixes

---
 .github/workflows/gpu-hvd-tests.yml | 2 +-
 .github/workflows/gpu-tests.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gpu-hvd-tests.yml b/.github/workflows/gpu-hvd-tests.yml
index 3f0dd5ad2c6..2017cf8acda 100644
--- a/.github/workflows/gpu-hvd-tests.yml
+++ b/.github/workflows/gpu-hvd-tests.yml
@@ -28,7 +28,7 @@ jobs:
       DOCKER_IMAGE: "pytorch/conda-builder:cuda12.1"
       REPOSITORY: ${{ github.repository }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-    runs-on: amz2023.linux.8xlarge.nvidia.gpu
+    runs-on: linux.8xlarge.nvidia.gpu
     timeout-minutes: 60
 
     steps:
diff --git a/.github/workflows/gpu-tests.yml b/.github/workflows/gpu-tests.yml
index 094f20ed225..81862e1f67b 100644
--- a/.github/workflows/gpu-tests.yml
+++ b/.github/workflows/gpu-tests.yml
@@ -28,7 +28,7 @@ jobs:
       DOCKER_IMAGE: "pytorch/conda-builder:cuda12.1"
       REPOSITORY: ${{ github.repository }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-    runs-on: amz2023.linux.8xlarge.nvidia.gpu
+    runs-on: linux.8xlarge.nvidia.gpu
     timeout-minutes: 85
 
     steps: