Skip to content

Record NVMe support for maintained Windows image definitions #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwmossmoz merged 2 commits into from
Sep 22, 2026
Merged

Record NVMe support for maintained Windows image definitions #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ca549e
Record NVMe support for maintained Windows image definitions
jwmossmoz Sep 22, 2026
5a22d6d
Keep image disk settings together
jwmossmoz Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 40 additions & 35 deletions terraform/azure_fxci/worker-images.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -470,13 +471,14 @@ 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 {
publisher = "MicrosoftWindowsDesktop"
Expand All @@ -499,13 +501,14 @@ 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 {
publisher = "MicrosoftWindowsDesktop"
Expand All @@ -528,13 +531,14 @@ 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 {
publisher = "MicrosoftWindowsServer"
Expand All @@ -557,13 +561,14 @@ 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 {
publisher = "MicrosoftWindowsServer"
Expand Down
2 changes: 1 addition & 1 deletion terraform/azure_trusted_fxci/worker-images.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading