Skip to content

Commit

Permalink
Update win11 22H2 worker image to shared image (#230)
Browse files Browse the repository at this point in the history
* Update win11 22H2 worker image to shared image

* Remove unused worker pool
  • Loading branch information
jwmoss authored Dec 18, 2024
1 parent b927a4b commit 595e42c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 90 deletions.
52 changes: 11 additions & 41 deletions worker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -251,49 +251,19 @@ ronin_t_windows11_64_24h2_alpha:
version: 1.0.0
resource_group: rg-packer-worker-images
deployment_id: alpha
SBOM: https://github.com/mozilla-platform-ops/worker-images/blob/main/config/win11-64-24h2.md
SBOM: https://github.com/mozilla-platform-ops/worker-images/blob/main/config/win11-64-24h2-alpha.md
name: win11_64_24h2_alpha
ronin-t-windows11-64-2009-alpha-test:
azure2:
version: NA
resource_group: rg-packer-through-cib
deployment_id: 69a7ecf
central-india: win11-64-2009-centralindia-win11-22h2-avd
central-us: win11-64-2009-centralus-win11-22h2-avd
east-us: win11-64-2009-eastus-win11-22h2-avd
east-us-2: win11-64-2009-eastus2-win11-22h2-avd
north-central-us: win11-64-2009-northcentralus-win11-22h2-avd
north-europe: win11-64-2009-northeurope-win11-22h2-avd
south-india: win11-64-2009-southindia-win11-22h2-avd
west-us: win11-64-2009-westus-win11-22h2-avd
west-us-2: win11-64-2009-westus2-win11-22h2-avd
west-us-3: win11-64-2009-westus3-win11-22h2-avd
ronin-t-windows11-64-2009-alpha:
ronin_t_windows11_64_2009_alpha:
azure2:
version: NA
resource_group: rg-packer-through-cib
version: 1.0.0
resource_group: rg-packer-worker-images
deployment_id: alpha
central-us: win11-64-2009-centralus-win11-22h2-avd
east-us: win11-64-2009-eastus-win11-22h2-avd
east-us-2: win11-64-2009-eastus2-win11-22h2-avd
north-central-us: win11-64-2009-northcentralus-win11-22h2-avd
north-europe: win11-64-2009-northeurope-win11-22h2-avd
west-us: win11-64-2009-westus-win11-22h2-avd
west-us-2: win11-64-2009-westus2-win11-22h2-avd
uk-south: win11-64-2009-uksouth-win11-22h2-avd
ronin-t-windows11-64-2009-prod:
SBOM: https://github.com/mozilla-platform-ops/worker-images/blob/main/config/win11-64-2009-alpha.md
name: win11_64_2009_alpha
ronin_t_windows11_64_2009:
azure2:
version: NA
resource_group: rg-packer-through-cib
version: 1.0.0
resource_group: rg-packer-worker-images
deployment_id: "8346140"
canada-central: win11-64-2009-canadacentral-win11-22h2-avd
central-india: win11-64-2009-centralindia-win11-22h2-avd
central-us: win11-64-2009-centralus-win11-22h2-avd
east-us: win11-64-2009-eastus-win11-22h2-avd
east-us-2: win11-64-2009-eastus2-win11-22h2-avd
north-central-us: win11-64-2009-northcentralus-win11-22h2-avd
north-europe: win11-64-2009-northeurope-win11-22h2-avd
south-india: win11-64-2009-southindia-win11-22h2-avd
west-us: win11-64-2009-westus-win11-22h2-avd
west-us-2: win11-64-2009-westus2-win11-22h2-avd
west-us-3: win11-64-2009-westus3-win11-22h2-avd
SBOM: https://github.com/mozilla-platform-ops/worker-images/blob/main/config/win11-64-2009.md
name: win11_64_2009
51 changes: 2 additions & 49 deletions worker-pools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2588,8 +2588,8 @@ pools:
config:
image:
by-suffix:
.*alpha: ronin-t-windows11-64-2009-alpha
default: ronin-t-windows11-64-2009-prod
.*alpha: ronin_t_windows11_64_2009_alpha
default: ronin_t_windows11_64_2009
image_resource_group: rg-packer-through-cib
implementation: generic-worker/worker-runner-windows
worker-purpose: '{pool-group}'
Expand Down Expand Up @@ -2820,53 +2820,6 @@ pools:
bootDiagnostics:
enabled: false
capacityPerInstance: 1
- pool_id: gecko-t/win11-64-2009-alpha-test
description: ''
owner: [email protected]
email_on_error: true
provider_id: azure2
config:
image: ronin-t-windows11-64-2009-alpha-test
image_resource_group: rg-packer-through-cib
implementation: generic-worker/worker-runner-windows
worker-purpose: gecko-t
locations: [east-us, east-us-2, west-us, west-us-2]
maxCapacity: 100
worker-config:
genericWorker:
config:
workerType: win11-64-2009-alpha
provisionerId: gecko-t
idleTimeoutSecs: 5400
tags:
sourceScript: provisioners/windows/azure/azure-bootstrap.ps1
sourceBranch: windows
sourceRepository: ronin_puppet
sourceOrganisation: mozilla-platform-ops
spot: true
vmSizes:
- vmSize: Standard_F8s_v2
launchConfig:
osProfile:
windowsConfiguration:
timeZone: UTC
enableAutomaticUpdates: false
storageProfile:
osDisk:
osType: Windows
createOption: FromImage
dataDisks:
- lun: 0
diskSizeGB: 30
managedDisk:
storageAccountType: StandardSSD_LRS
createOption: Empty
hardwareProfile:
vmSize: Standard_F8s_v2
diagnosticsProfile:
bootDiagnostics:
enabled: false
capacityPerInstance: 1
- pool_id: '{pool-group}/t-linux-large-gcp'
description: Worker for gecko-based automation.
owner: [email protected]
Expand Down

0 comments on commit 595e42c

Please sign in to comment.