Skip to content

Commit a7607fe

Browse files
grizzlytheodoreSandidoNickcandy
authored
Update Image Alias with new and remove deprecated (Azure#26408)
* Introduce new Ubuntu 2404 image alias, and update some old no longer existing images (Azure#26356) * test not working yet * test success * sanitize password in recording * Update ChangeLog.md --------- Co-authored-by: Adam Sandor <[email protected]> Co-authored-by: NanxiangLiu <[email protected]>
1 parent 857c10f commit a7607fe

File tree

4 files changed

+17679
-1675
lines changed

4 files changed

+17679
-1675
lines changed

‎src/Compute/Compute.Test/ScenarioTests/ImageTests.ps1‎

Lines changed: 86 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -342,123 +342,183 @@ function Test-DefaultImagesExistManual
342342
# UbuntuLTS test
343343

344344
# Ubuntu2204 test
345+
$vmname = "v1" + $rgname;
345346
$publisher = $images.Linux.Ubuntu2204.publisher;
346347
$offer = $images.Linux.Ubuntu2204.offer;
347348
$sku = $images.Linux.Ubuntu2204.sku;
348349
$version = $images.Linux.Ubuntu2204.version;
349350
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
350351
Assert-NotNull $img;
351-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Ubuntu2204;
352+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Ubuntu2204;
352353

354+
# Ubuntu 2404 test
355+
$vmname = "v2" + $rgname;
356+
$publisher = $images.Linux.Ubuntu2404.publisher;
357+
$offer = $images.Linux.Ubuntu2404.offer;
358+
$sku = $images.Linux.Ubuntu2404.sku;
359+
$version = $images.Linux.Ubuntu2404.version;
360+
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
361+
Assert-NotNull $img;
362+
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Ubuntu2404;
363+
364+
# Ubuntu 2404 Pro test
365+
$vmname = "v3" + $rgname;
366+
$publisher = $images.Linux.Ubuntu2404Pro.publisher;
367+
$offer = $images.Linux.Ubuntu2404Pro.offer;
368+
$sku = $images.Linux.Ubuntu2404Pro.sku;
369+
$version = $images.Linux.Ubuntu2404Pro.version;
370+
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
371+
Assert-NotNull $img;
372+
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Ubuntu2404Pro;
373+
353374
# CentOS versioned test
375+
$vmname = "v4" + $rgname;
354376
$publisher = $images.Linux.CentOS85Gen2.publisher;
355377
$offer = $images.Linux.CentOS85Gen2.offer;
356378
$sku = $images.Linux.CentOS85Gen2.sku;
357379
$version = $images.Linux.CentOS85Gen2.version;
358380
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
359381
Assert-NotNull $img;
360-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image CentOS85Gen2;
382+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image CentOS85Gen2;
361383

362384
# Debian versioned test
385+
$vmname = "v5" + $rgname;
363386
$publisher = $images.Linux.Debian11.publisher;
364387
$offer = $images.Linux.Debian11.offer;
365388
$sku = $images.Linux.Debian11.sku;
366389
$version = $images.Linux.Debian11.version;
367390
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
368391
Assert-NotNull $img;
369-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Debian11;
392+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Debian11;
370393

371394
# OpenSuseLeap154Gen2 versioned test
395+
$vmname = "v6" + $rgname;
372396
$publisher = $images.Linux.OpenSuseLeap154Gen2.publisher;
373397
$offer = $images.Linux.OpenSuseLeap154Gen2.offer;
374398
$sku = $images.Linux.OpenSuseLeap154Gen2.sku;
375399
$version = $images.Linux.OpenSuseLeap154Gen2.version;
376400
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
377401
Assert-NotNull $img;
378-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image OpenSuseLeap154Gen2;
402+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image OpenSuseLeap154Gen2;
379403

380404
# RHELRaw8LVMGen2 test
405+
$vmname = "v7" + $rgname;
381406
$publisher = $images.Linux.RHELRaw8LVMGen2.publisher;
382407
$offer = $images.Linux.RHELRaw8LVMGen2.offer;
383408
$sku = $images.Linux.RHELRaw8LVMGen2.sku;
384409
$version = $images.Linux.RHELRaw8LVMGen2.version;
385410
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
386411
Assert-NotNull $img;
387-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image RHELRaw8LVMGen2;
388-
389-
# SuseSles15SP3 versioned test
390-
$publisher = $images.Linux.SuseSles15SP3.publisher;
391-
$offer = $images.Linux.SuseSles15SP3.offer;
392-
$sku = $images.Linux.SuseSles15SP3.sku;
393-
$version = $images.Linux.SuseSles15SP3.version;
412+
New-AzVM -ResourceGroupName MyResourceGroup -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image RHELRaw8LVMGen2;
413+
414+
# SuseSles15SP5 versioned test
415+
$vmname = "v8" + $rgname;
416+
$publisher = $images.Linux.SuseSles15SP5.publisher;
417+
$offer = $images.Linux.SuseSles15SP5.offer;
418+
$sku = $images.Linux.SuseSles15SP5.sku;
419+
$version = $images.Linux.SuseSles15SP5.version;
394420
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
395421
Assert-NotNull $img;
396-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image SuseSles15SP3;
422+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image SuseSles15SP5;
397423

398424
# FlatcarLinuxFreeGen2 versioned test
425+
$vmname = "v9" + $rgname;
426+
$computerName = "c" + $rgname;
399427
$publisher = $images.Linux.FlatcarLinuxFreeGen2.publisher;
400428
$offer = $images.Linux.FlatcarLinuxFreeGen2.offer;
401429
$sku = $images.Linux.FlatcarLinuxFreeGen2.sku;
402430
$version = $images.Linux.FlatcarLinuxFreeGen2.version;
403431
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
404432
Assert-NotNull $img;
405-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image FlatcarLinuxFreeGen2;
433+
434+
$vnetname = "vn" + $rgname;
435+
$vnetAddress = "10.0.0.0/16";
436+
$subnetname = "slb" + $rgname;
437+
$subnetAddress = "10.0.2.0/24";
438+
$NICName = $vmname+ "-nic";
439+
$NSGName = $vmname + "-NSG";
440+
441+
442+
$frontendSubnet = New-AzVirtualNetworkSubnetConfig -Name $subnetname -AddressPrefix $subnetAddress;
443+
444+
$vnet = New-AzVirtualNetwork -Name $vnetname -ResourceGroupName $rgname -Location $loc -AddressPrefix $vnetAddress -Subnet $frontendSubnet;
445+
446+
$nsgRuleRDP = New-AzNetworkSecurityRuleConfig -Name RDP -Protocol Tcp -Direction Inbound -Priority 1001 -SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * -DestinationPortRange 3389 -Access Allow;
447+
$nsg = New-AzNetworkSecurityGroup -ResourceGroupName $RGName -Location $loc -Name $NSGName -SecurityRules $nsgRuleRDP;
448+
$nic = New-AzNetworkInterface -Name $NICName -ResourceGroupName $RGName -Location $loc -SubnetId $vnet.Subnets[0].Id -NetworkSecurityGroupId $nsg.Id -EnableAcceleratedNetworking;
449+
450+
# VM
451+
$vmConfig = New-AzVMConfig -SecurityType "Standard" -VmSize "Standard_DS3_v2" -Name $vmname;
452+
Set-AzVMOperatingSystem -VM $vmConfig -Windows -ComputerName $vmName -Credential $cred;
453+
Set-AzVMSourceImage -VM $vmConfig -PublisherName "kinvolk" -Offer "flatcar-container-linux-free" -Skus "stable-gen2" -Version "latest" ;
454+
Add-AzVMNetworkInterface -VM $vmConfig -Id $nic.Id;
455+
456+
#New-AzVM -ResourceGroupName $rgname -Location $loc -Vm $vmconfig;
457+
# New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image FlatcarLinuxFreeGen2;
406458

407459

408460
# Windows
409461
# Win2022AzureEditionCore test
462+
$vmname = "va" + $rgname;
410463
$publisher = $images.Windows.Win2022AzureEditionCore.publisher;
411464
$offer = $images.Windows.Win2022AzureEditionCore.offer;
412465
$sku = $images.Windows.Win2022AzureEditionCore.sku;
413466
$version = $images.Windows.Win2022AzureEditionCore.version;
414467
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
415468
Assert-NotNull $img;
416-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2022AzureEditionCore;
469+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2022AzureEditionCore;
470+
471+
# Win10 test
472+
$vmname = "vt" + $rgname;
473+
$publisher = $images.Windows.Win10.publisher;
474+
$offer = $images.Windows.Win10.offer;
475+
$sku = $images.Windows.Win10.sku;
476+
$version = $images.Windows.Win10.version;
477+
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
478+
Assert-NotNull $img;
479+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win10;
417480

418481
# Win2019Datacenter test
482+
$vmname = "vd" + $rgname;
419483
$publisher = $images.Windows.Win2019Datacenter.publisher;
420484
$offer = $images.Windows.Win2019Datacenter.offer;
421485
$sku = $images.Windows.Win2019Datacenter.sku;
422486
$version = $images.Windows.Win2019Datacenter.version;
423487
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
424488
Assert-NotNull $img;
425-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2019Datacenter;
489+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2019Datacenter;
426490

427491
# Win2016Datacenter test
492+
$vmname = "vs" + $rgname;
428493
$publisher = $images.Windows.Win2016Datacenter.publisher;
429494
$offer = $images.Windows.Win2016Datacenter.offer;
430495
$sku = $images.Windows.Win2016Datacenter.sku;
431496
$version = $images.Windows.Win2016Datacenter.version;
432497
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
433498
Assert-NotNull $img;
434-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2016Datacenter;
499+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2016Datacenter;
435500

436501
# Win2012R2Datacenter test
502+
$vmname = "vr" + $rgname;
437503
$publisher = $images.Windows.Win2012R2Datacenter.publisher;
438504
$offer = $images.Windows.Win2012R2Datacenter.offer;
439505
$sku = $images.Windows.Win2012R2Datacenter.sku;
440506
$version = $images.Windows.Win2012R2Datacenter.version;
441507
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
442508
Assert-NotNull $img;
443-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2012R2Datacenter;
509+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2012R2Datacenter;
444510

445511
# Win2012Datacenter test
512+
$vmname = "va" + $rgname;
446513
$publisher = $images.Windows.Win2012Datacenter.publisher;
447514
$offer = $images.Windows.Win2012Datacenter.offer;
448515
$sku = $images.Windows.Win2012Datacenter.sku;
449516
$version = $images.Windows.Win2012Datacenter.version;
450517
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
451518
Assert-NotNull $img;
452-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2012Datacenter;
519+
New-AzVM -ResourceGroupName $rgname -Name $vmname -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win2012Datacenter;
453520

454-
# Win10 test
455-
$publisher = $images.Windows.Win10.publisher;
456-
$offer = $images.Windows.Win10.offer;
457-
$sku = $images.Windows.Win10.sku;
458-
$version = $images.Windows.Win10.version;
459-
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
460-
Assert-NotNull $img;
461-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Win10;
521+
462522
}
463523
finally
464524
{

‎src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.ImageTests/TestDefaultImagesExistManual.json‎

Lines changed: 17536 additions & 1604 deletions
Large diffs are not rendered by default.

‎src/Compute/Compute/ChangeLog.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
2121
-->
2222
## Upcoming Release
23-
* Upgraded Azure.Core to 1.44.1.
24-
23+
* Updated image aliases to be up-to-date in the azure-powershell\src\Compute\Strategies\ComputeRp\Images.json file.
24+
* Upgraded Azure.Core to 1.44.1.
2525

2626
## Version 8.4.0
2727
* Added `SkuProfileVmSize` and `SkuProfileAllocationStrategy` parameters to `New-AzVmss`, `New-AzVmssConfig`, and `Update-AzVmss` cmdlets for VMSS Instance Mix operations.

‎src/Compute/Compute/Strategies/ComputeRp/Images.json‎

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,60 @@
11
{
2-
"Linux": {
3-
"CentOS85Gen2": {
4-
"publisher": "OpenLogic",
5-
"offer": "CentOS",
6-
"sku": "8_5-gen2",
7-
"version": "latest"
8-
},
9-
"Debian11": {
10-
"publisher": "Debian",
11-
"offer": "debian-11",
12-
"sku": "11-backports-gen2",
13-
"version": "latest"
14-
},
15-
"OpenSuseLeap154Gen2": {
16-
"publisher": "SUSE",
17-
"offer": "openSUSE-leap-15-4",
18-
"sku": "gen2",
19-
"version": "latest"
20-
},
21-
"RHELRaw8LVMGen2": {
22-
"publisher": "RedHat",
23-
"offer": "RHEL",
24-
"sku": "8-lvm-gen2",
25-
"version": "latest"
26-
},
27-
"SuseSles15SP3": {
28-
"publisher": "SUSE",
29-
"offer": "sles-15-sp3",
30-
"sku": "gen2",
31-
"version": "latest"
32-
},
33-
"Ubuntu2204": {
34-
"publisher": "Canonical",
35-
"offer": "0001-com-ubuntu-server-jammy",
36-
"sku": "22_04-lts-gen2",
37-
"version": "latest"
38-
},
39-
"FlatcarLinuxFreeGen2": {
40-
"publisher": "kinvolk",
41-
"offer": "flatcar-container-linux-free",
42-
"sku": "stable-gen2",
43-
"version": "latest"
44-
}
2+
"Linux": {
3+
"CentOS85Gen2": {
4+
"publisher": "OpenLogic",
5+
"offer": "CentOS",
6+
"sku": "8_5-gen2",
7+
"version": "latest"
8+
},
9+
"Debian11": {
10+
"publisher": "Debian",
11+
"offer": "debian-11",
12+
"sku": "11-backports-gen2",
13+
"version": "latest"
14+
},
15+
"OpenSuseLeap154Gen2": {
16+
"publisher": "SUSE",
17+
"offer": "openSUSE-leap-15-4",
18+
"sku": "gen2",
19+
"version": "latest"
20+
},
21+
"RHELRaw8LVMGen2": {
22+
"publisher": "RedHat",
23+
"offer": "RHEL",
24+
"sku": "8-lvm-gen2",
25+
"version": "latest"
26+
},
27+
"SuseSles15SP5": {
28+
"publisher": "SUSE",
29+
"offer": "sles-15-sp5",
30+
"sku": "gen2",
31+
"version": "latest"
4532
},
33+
"Ubuntu2204": {
34+
"publisher": "Canonical",
35+
"offer": "0001-com-ubuntu-server-jammy",
36+
"sku": "22_04-lts-gen2",
37+
"version": "latest"
38+
},
39+
"Ubuntu2404": {
40+
"publisher": "Canonical",
41+
"offer": "ubuntu-24_04-lts",
42+
"sku": "server",
43+
"version": "latest"
44+
},
45+
"Ubuntu2404Pro": {
46+
"publisher": "Canonical",
47+
"offer": "ubuntu-24_04-lts",
48+
"sku": "ubuntu-pro",
49+
"version": "latest"
50+
},
51+
"FlatcarLinuxFreeGen2": {
52+
"publisher": "kinvolk",
53+
"offer": "flatcar-container-linux-free",
54+
"sku": "stable-gen2",
55+
"version": "latest"
56+
}
57+
},
4658
"Windows": {
4759
"Win2022AzureEdition": {
4860
"publisher": "MicrosoftWindowsServer",

0 commit comments

Comments
 (0)