From 0ea42d9353a94c5869d2757c1ac0f0683d133ce6 Mon Sep 17 00:00:00 2001
From: Ry Jones <ry@linux.com>
Date: Wed, 19 Apr 2023 01:33:03 -0700
Subject: [PATCH] chore(ci): move to dedicated Fabric runners (#4170)

Signed-off-by: Ry Jones <ry@linux.com>
---
 .github/workflows/release.yml            | 12 ++++++------
 .github/workflows/verify-build.yml       |  6 +++---
 .github/workflows/vulnerability-scan.yml |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ca17219a116..b2a3ca6ee68 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,10 +24,10 @@ jobs:
     strategy:
       matrix:
         include:
-        - image: ubuntu-2004-paid
+        - image: fabric-ubuntu-20.04
           target: linux
           arch: amd64
-        - image: ubuntu-2004-paid
+        - image: fabric-ubuntu-20.04
           target: linux
           arch: arm64
         - image: macos-11
@@ -36,10 +36,10 @@ jobs:
         - image: macos-11
           target: darwin
           arch: arm64
-        - image: windows-2022
+        - image: fabric-windows-latest
           target: windows
           arch: amd64
-    runs-on: ubuntu-2004-paid
+    runs-on: fabric-ubuntu-20.04
     steps:
       - name: Install Go
         uses: actions/setup-go@v3
@@ -63,7 +63,7 @@ jobs:
 
   build-and-push-docker-images:
     name: Build and Push
-    runs-on: ubuntu-2004-paid
+    runs-on: fabric-ubuntu-20.04
 
     permissions:
       contents: read
@@ -136,7 +136,7 @@ jobs:
     needs:
       - build-binaries
       - build-and-push-docker-images
-    runs-on: ubuntu-2004-paid
+    runs-on: fabric-ubuntu-20.04
     permissions:
       contents: write
     steps:
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index e1cff728dec..092a096ae69 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -21,7 +21,7 @@ permissions:
 jobs:
   basic-checks:
     name: Basic Checks
-    runs-on: ubuntu-2004-paid
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/setup-go@v3
         name: Install Go
@@ -36,7 +36,7 @@ jobs:
   unit-tests:
     name: Unit Tests
     needs: basic-checks
-    runs-on: ubuntu-2004-paid
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/setup-go@v3
         name: Install Go
@@ -55,7 +55,7 @@ jobs:
       fail-fast: false
       matrix:
         INTEGRATION_TEST_SUITE: ["raft","pvtdata","pvtdatapurge","ledger","lifecycle","e2e smartbft","discovery gossip devmode pluggable","gateway idemix pkcs11 configtx configtxlator","sbe nwo msp"]
-    runs-on: ubuntu-2004-paid
+    runs-on: fabric-ubuntu-20.04
     steps:
       - uses: actions/setup-go@v3
         name: Install Go
diff --git a/.github/workflows/vulnerability-scan.yml b/.github/workflows/vulnerability-scan.yml
index e0575bde26e..efd5c63c100 100644
--- a/.github/workflows/vulnerability-scan.yml
+++ b/.github/workflows/vulnerability-scan.yml
@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   scan:
-    runs-on: ubuntu-latest-m
+    runs-on: fabric-ubuntu-latest
     strategy:
       fail-fast: false
       matrix: