From d1a8bdd82c50bc5f43f6f3a2f457cf7cb3f35a54 Mon Sep 17 00:00:00 2001 From: Jonathan Moss Date: Mon, 21 Sep 2026 11:14:25 -0400 Subject: [PATCH 1/4] Record NVMe support for the Windows 10 alpha image --- terraform/azure_fxci/worker-images.tf | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/terraform/azure_fxci/worker-images.tf b/terraform/azure_fxci/worker-images.tf index ff2caa2f..6215e375 100644 --- a/terraform/azure_fxci/worker-images.tf +++ b/terraform/azure_fxci/worker-images.tf @@ -228,13 +228,18 @@ resource "azurerm_shared_image_gallery" "win10_64_2009_alpha" { } resource "azurerm_shared_image" "win10_64_2009_alpha" { - name = "win10_64_2009_alpha" - gallery_name = azurerm_shared_image_gallery.win10_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 = "win10_64_2009_alpha" + gallery_name = azurerm_shared_image_gallery.win10_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 + + lifecycle { + prevent_destroy = true + } identifier { publisher = "MicrosoftWindowsDesktop" From aafa7d1679f2c187df6caf3427ccfc060961e061 Mon Sep 17 00:00:00 2001 From: Jonathan Moss Date: Mon, 21 Sep 2026 11:16:07 -0400 Subject: [PATCH 2/4] Remove the Windows 10 alpha deletion guard --- terraform/azure_fxci/worker-images.tf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/terraform/azure_fxci/worker-images.tf b/terraform/azure_fxci/worker-images.tf index 6215e375..c861dc8d 100644 --- a/terraform/azure_fxci/worker-images.tf +++ b/terraform/azure_fxci/worker-images.tf @@ -237,10 +237,6 @@ resource "azurerm_shared_image" "win10_64_2009_alpha" { hyper_v_generation = "V2" disk_controller_type_nvme_enabled = true - lifecycle { - prevent_destroy = true - } - identifier { publisher = "MicrosoftWindowsDesktop" offer = "Windows-10" From 8f61316d04c899a04ec54f82623e5089d0c63580 Mon Sep 17 00:00:00 2001 From: Jonathan Moss Date: Mon, 21 Sep 2026 11:17:29 -0400 Subject: [PATCH 3/4] Manage Windows 10 alpha through the shared image map --- terraform/azure_fxci/worker-images.tf | 41 +++++++++------------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/terraform/azure_fxci/worker-images.tf b/terraform/azure_fxci/worker-images.tf index c861dc8d..8c1dd345 100644 --- a/terraform/azure_fxci/worker-images.tf +++ b/terraform/azure_fxci/worker-images.tf @@ -1,5 +1,13 @@ locals { shared_images = { + "win10_64_2009_alpha" = { + publisher = "MicrosoftWindowsDesktop" + offer = "Windows-10" + sku = "win10-22h2-avd-g2" + architecture = "x64" + os_type = "Windows" + hyper_v_generation = "V2" + }, "win10642009alpha" = { publisher = "MicrosoftWindowsDesktop" offer = "Windows-10" @@ -213,35 +221,14 @@ resource "azurerm_resource_group" "rg-packer-worker-images" { }) ) } -## win10-64-2009-alpha -resource "azurerm_shared_image_gallery" "win10_64_2009_alpha" { - name = "win10_64_2009_alpha" - resource_group_name = azurerm_resource_group.rg-packer-worker-images.name - location = azurerm_resource_group.rg-packer-worker-images.location - description = "win10_64_2009_alpha" - - tags = merge(local.common_tags, - tomap({ - "Name" = "rg-packer-worker-images" - }) - ) +moved { + from = azurerm_shared_image_gallery.win10_64_2009_alpha + to = azurerm_shared_image_gallery.this["win10_64_2009_alpha"] } -resource "azurerm_shared_image" "win10_64_2009_alpha" { - name = "win10_64_2009_alpha" - gallery_name = azurerm_shared_image_gallery.win10_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 { - publisher = "MicrosoftWindowsDesktop" - offer = "Windows-10" - sku = "win10-22h2-avd-g2" - } +moved { + from = azurerm_shared_image.win10_64_2009_alpha + to = azurerm_shared_image.this["win10_64_2009_alpha"] } ## win10-64-2009 From 451dcc2be39a9c2b29236dc02a6f3101bb096b5a Mon Sep 17 00:00:00 2001 From: Jonathan Moss Date: Mon, 21 Sep 2026 11:26:25 -0400 Subject: [PATCH 4/4] Keep the NVMe change on the existing alpha resource --- terraform/azure_fxci/worker-images.tf | 41 ++++++++++++++++++--------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/terraform/azure_fxci/worker-images.tf b/terraform/azure_fxci/worker-images.tf index 8c1dd345..c861dc8d 100644 --- a/terraform/azure_fxci/worker-images.tf +++ b/terraform/azure_fxci/worker-images.tf @@ -1,13 +1,5 @@ locals { shared_images = { - "win10_64_2009_alpha" = { - publisher = "MicrosoftWindowsDesktop" - offer = "Windows-10" - sku = "win10-22h2-avd-g2" - architecture = "x64" - os_type = "Windows" - hyper_v_generation = "V2" - }, "win10642009alpha" = { publisher = "MicrosoftWindowsDesktop" offer = "Windows-10" @@ -221,14 +213,35 @@ resource "azurerm_resource_group" "rg-packer-worker-images" { }) ) } -moved { - from = azurerm_shared_image_gallery.win10_64_2009_alpha - to = azurerm_shared_image_gallery.this["win10_64_2009_alpha"] +## win10-64-2009-alpha +resource "azurerm_shared_image_gallery" "win10_64_2009_alpha" { + name = "win10_64_2009_alpha" + resource_group_name = azurerm_resource_group.rg-packer-worker-images.name + location = azurerm_resource_group.rg-packer-worker-images.location + description = "win10_64_2009_alpha" + + tags = merge(local.common_tags, + tomap({ + "Name" = "rg-packer-worker-images" + }) + ) } -moved { - from = azurerm_shared_image.win10_64_2009_alpha - to = azurerm_shared_image.this["win10_64_2009_alpha"] +resource "azurerm_shared_image" "win10_64_2009_alpha" { + name = "win10_64_2009_alpha" + gallery_name = azurerm_shared_image_gallery.win10_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 { + publisher = "MicrosoftWindowsDesktop" + offer = "Windows-10" + sku = "win10-22h2-avd-g2" + } } ## win10-64-2009