[PATCH v2 0/5] Use windows-2019 VM Image

[PATCH v2 0/5] Use windows-2019 VM Image

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3890
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3891

Pipelines are currently building against VS2019 and use the
"windows-latest" VM image in Azure Pipelines. The "windows-latest"
image recently moved its toolchain to VS2022, so VS2019 is no
longer found.

To immediately address the issue with no change in build behavior,
this series updates YAML files in the repository using
"windows-latest" to "windows-2019".

V2 Changes:

Introduces additional changes to get pipelines back working
in addition to the original windows-2019 change originally
scoped for the patch series.

1. Add patch v2 [1/5] to use Python 3.8 to work around an issue
   when updating a tar file web_dependency.
2. Add patch v2 [5/5] to update the GCC ARM compiler.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Abner Chang <abner.chang@hpe.com>
Cc: Nickle Wang <nickle.wang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>

Michael Kubacki (5):
  .azurepipelines: Use Python 3.8
  .azurepipelines: Use windows-2019 VM image
  EmulatorPkg: Use windows-2019 VM image
  OvmfPkg: Use windows-2019 VM image
  BaseTools/Bin: Update GCC ARM compiler version

 .azurepipelines/Ubuntu-PatchCheck.yml                     | 2 +-
 .azurepipelines/Windows-VS2019.yml                        | 2 +-
 .azurepipelines/templates/platform-build-run-steps.yml    | 2 +-
 .azurepipelines/templates/pr-gate-steps.yml               | 2 +-
 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml              | 8 ++++----
 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml                  | 8 ++++----
 EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
 OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml     | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

-- 
2.28.0.windows.1

[PATCH v2 1/5] .azurepipelines: Use Python 3.8

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3891

Changes the Python version used in pipelines to 3.8.x (3.8.12) to
workaround an issue discovered after 3.9.10 that causes
stuart_update to fail on a web_dependency (e.g. GCC ARM compilers).

The Python version should be updated to latest once that issue is
root caused and a long term fix is in place. This change is
introduced now to unblock overall CI.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
---
 .azurepipelines/Ubuntu-PatchCheck.yml                  | 2 +-
 .azurepipelines/templates/platform-build-run-steps.yml | 2 +-
 .azurepipelines/templates/pr-gate-steps.yml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.azurepipelines/Ubuntu-PatchCheck.yml b/.azurepipelines/Ubuntu-PatchCheck.yml
index d55c238592ef..1bc28176b6e8 100644
--- a/.azurepipelines/Ubuntu-PatchCheck.yml
+++ b/.azurepipelines/Ubuntu-PatchCheck.yml
@@ -27,7 +27,7 @@ steps:
 
 - task: UsePythonVersion@0
   inputs:
-    versionSpec: '3.9.x'
+    versionSpec: '3.8.x'
     architecture: 'x64'
 
 - script: |
diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
index 36cdce9bf8fa..97e7faa26682 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -42,7 +42,7 @@ steps:
 
 - task: UsePythonVersion@0
   inputs:
-    versionSpec: "3.9.x"
+    versionSpec: "3.8.x"
     architecture: "x64"
 
 - script: pip install -r pip-requirements.txt --upgrade
diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
index 6601c247421b..70c19a462194 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -20,7 +20,7 @@ steps:
 
 - task: UsePythonVersion@0
   inputs:
-    versionSpec: '3.9.x'
+    versionSpec: '3.8.x'
     architecture: 'x64'
 
 - script: pip install -r pip-requirements.txt --upgrade
-- 
2.28.0.windows.1

[PATCH v2 2/5] .azurepipelines: Use windows-2019 VM image

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3890

The YAML file previously specified "windows-latest" which recently
moved to VS2022. To continue using VS2019 (at least in the short
term), the VM image needs to be explicitly set to "windows-2019".

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
---
 .azurepipelines/Windows-VS2019.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azurepipelines/Windows-VS2019.yml b/.azurepipelines/Windows-VS2019.yml
index 22f2d88c2c6a..e4bd4b1d2283 100644
--- a/.azurepipelines/Windows-VS2019.yml
+++ b/.azurepipelines/Windows-VS2019.yml
@@ -16,5 +16,5 @@ jobs:
 - template: templates/pr-gate-build-job.yml
   parameters:
     tool_chain_tag: 'VS2019'
-    vm_image: 'windows-latest'
+    vm_image: 'windows-2019'
     arch_list: "IA32,X64"
-- 
2.28.0.windows.1

[PATCH v2 3/5] EmulatorPkg: Use windows-2019 VM image

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3890

The YAML file previously specified "windows-latest" which recently
moved to VS2022. To continue using VS2019 (at least in the short
term), the VM image needs to be explicitly set to "windows-2019".

Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Abner Chang <abner.chang@hpe.com>
Cc: Nickle Wang <nickle.wang@hpe.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
---
 EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index 03ffb1a5a5c7..e7ead06ae266 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -20,7 +20,7 @@ jobs:
   - job: Platform_CI
     variables:
       package: 'EmulatorPkg'
-      vm_image: 'windows-latest'
+      vm_image: 'windows-2019'
       should_run: true
       run_flags: "MAKE_STARTUP_NSH=TRUE"
 
-- 
2.28.0.windows.1

[PATCH v2 4/5] OvmfPkg: Use windows-2019 VM image

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3890

The YAML file previously specified "windows-latest" which recently
moved to VS2022. To continue using VS2019 (at least in the short
term), the VM image needs to be explicitly set to "windows-2019".

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
---
 OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index 68b5d951e908..7d6344d6383d 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -18,7 +18,7 @@ jobs:
   - job: Platform_CI
     variables:
       package: 'OvmfPkg'
-      vm_image: 'windows-latest'
+      vm_image: 'windows-2019'
       should_run: true
       run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"
 
-- 
2.28.0.windows.1

[PATCH v2 5/5] BaseTools/Bin: Update GCC ARM compiler version

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

Updates to the latest release 11.2-2022.02. The previous download
page (10.3-2021.07) has been marked deprecated.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
---
 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml | 8 ++++----
 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
index de7682b5521f..ff8a9e868100 100644
--- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
+++ b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
@@ -11,11 +11,11 @@
   "scope": "gcc_aarch64_linux",
   "type": "web",
   "name": "gcc_aarch64_linux",
-  "source": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz",
-  "version": "10.3-2021.07",
-  "sha256": "1e33d53dea59c8de823bbdfe0798280bdcd138636c7060da9d77a97ded095a84",
+  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz",
+  "version": "11.2-2022.02",
+  "sha256": "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
   "compression_type": "tar",
-  "internal_path": "/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/",
+  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
   "flags": ["set_shell_var", ],
   "var_name": "GCC5_AARCH64_INSTALL"
 }
diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
index 9b3c4e394fa1..151cbfa4b532 100644
--- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
+++ b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
@@ -11,11 +11,11 @@
   "scope": "gcc_arm_linux",
   "type": "web",
   "name": "gcc_arm_linux",
-  "source": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.asc",
-  "version": "10.3-2021.07",
-  "sha256": "aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c",
+  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz",
+  "version": "11.2-2022.02",
+  "sha256": "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
   "compression_type": "tar",
-  "internal_path": "/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/",
+  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
   "flags": ["set_shell_var", ],
   "var_name": "GCC5_ARM_INSTALL"
 }
-- 
2.28.0.windows.1

Re: [edk2-devel] [PATCH v2 0/5] Use windows-2019 VM Image

[Sean]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

Just confirming my RB for the entire series.
I appreciate the work here to identify a number of odd issues with CI, external tools, python patch versions, etc.

Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>

For others, we will continue looking into python issue for tar files/ext_dep as well as prepare the VS2022 changes.

[-- Attachment #2: Type: text/html, Size: 443 bytes --]