From 5ca549e9a5b0900aa82d5616c56599bde47089a8 Mon Sep 17 00:00:00 2001 From: Jonathan Moss Date: Tue, 22 Sep 2026 15:31:51 -0400 Subject: [PATCH 1/2] Record NVMe support for maintained Windows image definitions --- terraform/azure_fxci/worker-images.tf | 23 +++++++++++++------ terraform/azure_trusted_fxci/worker-images.tf | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/terraform/azure_fxci/worker-images.tf b/terraform/azure_fxci/worker-images.tf index c861dc8d..2cb55f5e 100644 --- a/terraform/azure_fxci/worker-images.tf +++ b/terraform/azure_fxci/worker-images.tf @@ -259,13 +259,14 @@ resource "azurerm_shared_image_gallery" "win10_64_2009" { } resource "azurerm_shared_image" "win10_64_2009" { - name = "win10_64_2009" - gallery_name = azurerm_shared_image_gallery.win10_64_2009.name - resource_group_name = azurerm_resource_group.rg-packer-worker-images.name - location = azurerm_resource_group.rg-packer-worker-images.location - os_type = "Windows" - release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" - hyper_v_generation = "V2" + name = "win10_64_2009" + gallery_name = azurerm_shared_image_gallery.win10_64_2009.name + resource_group_name = azurerm_resource_group.rg-packer-worker-images.name + location = azurerm_resource_group.rg-packer-worker-images.location + os_type = "Windows" + release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" + hyper_v_generation = "V2" + disk_controller_type_nvme_enabled = true identifier { publisher = "MicrosoftWindowsDesktop" @@ -478,6 +479,8 @@ resource "azurerm_shared_image" "win11_64_24h2" { release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" hyper_v_generation = "V2" + disk_controller_type_nvme_enabled = true + identifier { publisher = "MicrosoftWindowsDesktop" offer = "Windows-11" @@ -507,6 +510,8 @@ resource "azurerm_shared_image" "win11_64_24h2_alpha" { release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" hyper_v_generation = "V2" + disk_controller_type_nvme_enabled = true + identifier { publisher = "MicrosoftWindowsDesktop" offer = "Windows-11" @@ -536,6 +541,8 @@ resource "azurerm_shared_image" "win2022_64_2009_alpha" { release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" hyper_v_generation = "V2" + disk_controller_type_nvme_enabled = true + identifier { publisher = "MicrosoftWindowsServer" offer = "WindowsServer" @@ -565,6 +572,8 @@ resource "azurerm_shared_image" "win2022_64_2009" { release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" hyper_v_generation = "V2" + disk_controller_type_nvme_enabled = true + identifier { publisher = "MicrosoftWindowsServer" offer = "WindowsServer" diff --git a/terraform/azure_trusted_fxci/worker-images.tf b/terraform/azure_trusted_fxci/worker-images.tf index 04a9218f..20a63e89 100644 --- a/terraform/azure_trusted_fxci/worker-images.tf +++ b/terraform/azure_trusted_fxci/worker-images.tf @@ -57,7 +57,7 @@ locals { gallery_description = "trusted-win2022-64-2009" gallery_tags = local.legacy_gallery_tags image_tags = {} - disk_controller_type_nvme_enabled = false + disk_controller_type_nvme_enabled = true }, "trusted_win2025_64_24h2" = { publisher = "MicrosoftWindowsServer" From 5a22d6d9c5a6ad7528b8d12af6257826a518680d Mon Sep 17 00:00:00 2001 From: Jonathan Moss Date: Tue, 22 Sep 2026 15:36:10 -0400 Subject: [PATCH 2/2] Keep image disk settings together --- terraform/azure_fxci/worker-images.tf | 60 +++++++++++++-------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/terraform/azure_fxci/worker-images.tf b/terraform/azure_fxci/worker-images.tf index 2cb55f5e..bc676ae4 100644 --- a/terraform/azure_fxci/worker-images.tf +++ b/terraform/azure_fxci/worker-images.tf @@ -471,14 +471,13 @@ resource "azurerm_shared_image_gallery" "win11_64_24h2" { } resource "azurerm_shared_image" "win11_64_24h2" { - name = "win11_64_24h2" - gallery_name = azurerm_shared_image_gallery.win11_64_24h2.name - resource_group_name = azurerm_resource_group.rg-packer-worker-images.name - location = azurerm_resource_group.rg-packer-worker-images.location - os_type = "Windows" - release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" - hyper_v_generation = "V2" - + name = "win11_64_24h2" + gallery_name = azurerm_shared_image_gallery.win11_64_24h2.name + resource_group_name = azurerm_resource_group.rg-packer-worker-images.name + location = azurerm_resource_group.rg-packer-worker-images.location + os_type = "Windows" + release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" + hyper_v_generation = "V2" disk_controller_type_nvme_enabled = true identifier { @@ -502,14 +501,13 @@ resource "azurerm_shared_image_gallery" "win11_64_24h2_alpha" { } resource "azurerm_shared_image" "win11_64_24h2_alpha" { - name = "win11_64_24h2_alpha" - gallery_name = azurerm_shared_image_gallery.win11_64_24h2_alpha.name - resource_group_name = azurerm_resource_group.rg-packer-worker-images.name - location = azurerm_resource_group.rg-packer-worker-images.location - os_type = "Windows" - release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" - hyper_v_generation = "V2" - + name = "win11_64_24h2_alpha" + gallery_name = azurerm_shared_image_gallery.win11_64_24h2_alpha.name + resource_group_name = azurerm_resource_group.rg-packer-worker-images.name + location = azurerm_resource_group.rg-packer-worker-images.location + os_type = "Windows" + release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" + hyper_v_generation = "V2" disk_controller_type_nvme_enabled = true identifier { @@ -533,14 +531,13 @@ resource "azurerm_shared_image_gallery" "win2022_64_2009_alpha" { } resource "azurerm_shared_image" "win2022_64_2009_alpha" { - name = "win2022_64_2009_alpha" - gallery_name = azurerm_shared_image_gallery.win2022_64_2009_alpha.name - resource_group_name = azurerm_resource_group.rg-packer-worker-images.name - location = azurerm_resource_group.rg-packer-worker-images.location - os_type = "Windows" - release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" - hyper_v_generation = "V2" - + name = "win2022_64_2009_alpha" + gallery_name = azurerm_shared_image_gallery.win2022_64_2009_alpha.name + resource_group_name = azurerm_resource_group.rg-packer-worker-images.name + location = azurerm_resource_group.rg-packer-worker-images.location + os_type = "Windows" + release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" + hyper_v_generation = "V2" disk_controller_type_nvme_enabled = true identifier { @@ -564,14 +561,13 @@ resource "azurerm_shared_image_gallery" "win2022_64_2009" { } resource "azurerm_shared_image" "win2022_64_2009" { - name = "win2022_64_2009" - gallery_name = azurerm_shared_image_gallery.win2022_64_2009.name - resource_group_name = azurerm_resource_group.rg-packer-worker-images.name - location = azurerm_resource_group.rg-packer-worker-images.location - os_type = "Windows" - release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" - hyper_v_generation = "V2" - + name = "win2022_64_2009" + gallery_name = azurerm_shared_image_gallery.win2022_64_2009.name + resource_group_name = azurerm_resource_group.rg-packer-worker-images.name + location = azurerm_resource_group.rg-packer-worker-images.location + os_type = "Windows" + release_note_uri = "https://github.com/mozilla-platform-ops/worker-images/releases" + hyper_v_generation = "V2" disk_controller_type_nvme_enabled = true identifier {