ArmVirtPkg/PlatformCI: Enable optional features on Qemu AARCH64 builds

[mirror_edk2.git] / ArmVirtPkg / PlatformCI / .azurepipelines / Ubuntu-GCC5.yml

diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 5a0e589ed4a754595b70e92c4794b4e7f1c115f6..44a1d3da674254718900c6c57f21b2307d44862a 100644 (file)
--- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -22,7 +22,7 @@ jobs:
   - job: Platform_CI\r
     variables:\r
       package: 'ArmVirtPkg'\r
-      vm_image: 'ubuntu-18.04'\r
+      vm_image: 'ubuntu-22.04'\r
       should_run: true\r
       run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"\r
 \r
@@ -30,42 +30,42 @@ jobs:
     strategy:\r
         matrix:\r
           QEMU_AARCH64_DEBUG:\r
-            Build.File: "$(package)/PlatformCI/PlatformBuild.py"\r
+            Build.File: "$(package)/PlatformCI/QemuBuild.py"\r
             Build.Arch: "AARCH64"\r
-            Build.Flags: ""\r
+            Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"\r
             Build.Target: "DEBUG"\r
             Run.Flags: $(run_flags)\r
             Run: $(should_run)\r
           QEMU_AARCH64_RELEASE:\r
-            Build.File: "$(package)/PlatformCI/PlatformBuild.py"\r
+            Build.File: "$(package)/PlatformCI/QemuBuild.py"\r
             Build.Arch: "AARCH64"\r
-            Build.Flags: ""\r
+            Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"\r
             Build.Target: "RELEASE"\r
             Run.Flags: $(run_flags)\r
             Run: $(should_run)\r
           QEMU_AARCH64_NOOPT:\r
-            Build.File: "$(package)/PlatformCI/PlatformBuild.py"\r
+            Build.File: "$(package)/PlatformCI/QemuBuild.py"\r
             Build.Arch: "AARCH64"\r
-            Build.Flags: ""\r
+            Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"\r
             Build.Target: "NOOPT"\r
             Run.Flags: $(run_flags)\r
             Run: $(should_run)\r
           QEMU_ARM_DEBUG:\r
-            Build.File: "$(package)/PlatformCI/PlatformBuild.py"\r
+            Build.File: "$(package)/PlatformCI/QemuBuild.py"\r
             Build.Arch: "ARM"\r
             Build.Flags: ""\r
             Build.Target: "DEBUG"\r
             Run.Flags: $(run_flags)\r
             Run: $(should_run)\r
           QEMU_ARM_RELEASE:\r
-            Build.File: "$(package)/PlatformCI/PlatformBuild.py"\r
+            Build.File: "$(package)/PlatformCI/QemuBuild.py"\r
             Build.Arch: "ARM"\r
             Build.Flags: ""\r
             Build.Target: "RELEASE"\r
             Run.Flags: $(run_flags)\r
             Run: $(should_run)\r
           QEMU_ARM_NOOPT:\r
-            Build.File: "$(package)/PlatformCI/PlatformBuild.py"\r
+            Build.File: "$(package)/PlatformCI/QemuBuild.py"\r
             Build.Arch: "ARM"\r
             Build.Flags: ""\r
             Build.Target: "NOOPT"\r
@@ -78,6 +78,8 @@ jobs:
     pool:\r
       vmImage: $(vm_image)\r
 \r
+    container: ${{ variables.default_linux_image }}\r
+\r
     steps:\r
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml\r
       parameters:\r
@@ -88,8 +90,4 @@ jobs:
         build_file: $(Build.File)\r
         build_flags: $(Build.Flags)\r
         run_flags: $(Run.Flags)\r
-        usePythonVersion: ${{ variables.default_python_version }}\r
-        extra_install_step:\r
-        - bash: sudo apt-get install qemu\r
-          displayName: Install qemu\r
-          condition: and(gt(variables.pkg_count, 0), succeeded())\r
+        usePythonVersion: '' # use Python from the container image\r