From 3cdc63ba1af60bf51e5df124b1b17b8e6d9765ee Mon Sep 17 00:00:00 2001
From: Chris Fernald <chfernal@microsoft.com>
Date: Fri, 21 Oct 2022 09:34:15 -0700
Subject: [PATCH] Switch Core GCC CI to container

---
 .azurepipelines/Ubuntu-GCC5.yml                      |  4 +++-
 Platforms/QemuQ35Pkg/.azurepipelines/Ubuntu-GCC5.yml | 10 ----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml
index ad77394276..48ebc03688 100644
--- a/.azurepipelines/Ubuntu-GCC5.yml
+++ b/.azurepipelines/Ubuntu-GCC5.yml
@@ -30,5 +30,7 @@ jobs:
     packages: QemuQ35Pkg
     target_list: NO-TARGET
     tool_chain_tag: $(tool_chain_tag)
-    vm_image: $(vm_image)
+    vm_image: ubuntu-latest
+    install_tools: false
+    container_image: ghcr.io/tianocore/containers/fedora-35-build:ddf6315
 
diff --git a/Platforms/QemuQ35Pkg/.azurepipelines/Ubuntu-GCC5.yml b/Platforms/QemuQ35Pkg/.azurepipelines/Ubuntu-GCC5.yml
index 4803b4265b..23e5a265f0 100644
--- a/Platforms/QemuQ35Pkg/.azurepipelines/Ubuntu-GCC5.yml
+++ b/Platforms/QemuQ35Pkg/.azurepipelines/Ubuntu-GCC5.yml
@@ -75,15 +75,5 @@ jobs:
         build_file: $(Build.File)
         build_flags: $(Build.Flags)
         run_flags: $(Run.Flags)
-<<<<<<< HEAD
-        extra_install_step:
-        - bash: sudo apt-get update
-          displayName: Update Apt
-          condition: and(gt(variables.pkg_count, 0), succeeded())
-        - bash: sudo apt-get install gcc g++ make uuid-dev qemu-kvm qemu
-          displayName: Install Packages
-          condition: and(gt(variables.pkg_count, 0), succeeded())
-=======
->>>>>>> a21b547b (Move platform build to using tianocore test container)
         extra_artifacts: |
           **/QEMUQ35_*.fd