Switch Core GCC CI to container

microsoft · Oct 24, 2022 · 3cdc63b · 3cdc63b
1 parent 0a11636
commit 3cdc63b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git 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
@@ -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