Skip to content

Commit ab2ff2d

Browse files
SandidoVeryEarly
Sandido
and
VeryEarly
authored
Remove unversioned image aliases (#22888)
* remove ubutnults test * remove all aliases and tests * compute tests fix * recoveryservices tests fixed * help doc updates and changelog * cleanup examples * Update ChangeLog.md --------- Co-authored-by: Yabo Hu <[email protected]>
1 parent f3f66fd commit ab2ff2d

File tree

9 files changed

+1348
-5598
lines changed

9 files changed

+1348
-5598
lines changed

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

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -338,14 +338,7 @@ function Test-DefaultImagesExistManual
338338

339339
# Linux
340340
# UbuntuLTS test
341-
$publisher = $images.Linux.UbuntuLTS.publisher;
342-
$offer = $images.Linux.UbuntuLTS.offer;
343-
$sku = $images.Linux.UbuntuLTS.sku;
344-
$version = $images.Linux.UbuntuLTS.version;
345-
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
346-
Assert-NotNull $img;
347-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image UbuntuLTS;
348-
341+
349342
# Ubuntu2204 test
350343
$publisher = $images.Linux.Ubuntu2204.publisher;
351344
$offer = $images.Linux.Ubuntu2204.offer;
@@ -355,15 +348,6 @@ function Test-DefaultImagesExistManual
355348
Assert-NotNull $img;
356349
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Ubuntu2204;
357350

358-
# CentOS test
359-
$publisher = $images.Linux.CentOS.publisher;
360-
$offer = $images.Linux.CentOS.offer;
361-
$sku = $images.Linux.CentOS.sku;
362-
$version = $images.Linux.CentOS.version;
363-
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
364-
Assert-NotNull $img;
365-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image CentOS;
366-
367351
# CentOS versioned test
368352
$publisher = $images.Linux.CentOS85Gen2.publisher;
369353
$offer = $images.Linux.CentOS85Gen2.offer;
@@ -373,15 +357,6 @@ function Test-DefaultImagesExistManual
373357
Assert-NotNull $img;
374358
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image CentOS85Gen2;
375359

376-
# Debian test
377-
$publisher = $images.Linux.Debian.publisher;
378-
$offer = $images.Linux.Debian.offer;
379-
$sku = $images.Linux.Debian.sku;
380-
$version = $images.Linux.Debian.version;
381-
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
382-
Assert-NotNull $img;
383-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Debian;
384-
385360
# Debian versioned test
386361
$publisher = $images.Linux.Debian11.publisher;
387362
$offer = $images.Linux.Debian11.offer;
@@ -399,16 +374,7 @@ function Test-DefaultImagesExistManual
399374
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
400375
Assert-NotNull $img;
401376
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image OpenSuseLeap154Gen2;
402-
403-
# RHEL test
404-
$publisher = $images.Linux.RHEL.publisher;
405-
$offer = $images.Linux.RHEL.offer;
406-
$sku = $images.Linux.RHEL.sku;
407-
$version = $images.Linux.RHEL.version;
408-
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
409-
Assert-NotNull $img;
410-
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image RHEL;
411-
377+
412378
# RHELRaw8LVMGen2 test
413379
$publisher = $images.Linux.RHELRaw8LVMGen2.publisher;
414380
$offer = $images.Linux.RHELRaw8LVMGen2.offer;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,14 +402,14 @@ function Test-SimpleNewVmWithDefaultDomainName2
402402
-ResourceGroupName $rgname `
403403
-Name $vmname `
404404
-Credential $cred `
405-
-ImageName "ubuntults"
405+
-ImageName "ubuntu2204"
406406

407407
# second VM
408408
$x2 = New-AzVM `
409409
-ResourceGroupName $rgname2 `
410410
-Name $vmname `
411411
-Credential $cred `
412-
-ImageName "ubuntults"
412+
-ImageName "ubuntu2204"
413413
}
414414
finally
415415
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5262,7 +5262,7 @@ function Test-VMwithSSHKey
52625262
$vmname = '1' + $rgname;
52635263
$domainNameLabel = "d1" + $rgname;
52645264
$sshKeyName = "s" + $rgname
5265-
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Credential $cred -Image CentOS -DomainNameLabel $domainNameLabel -SshKeyname $sshKeyName -generateSshkey
5265+
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Credential $cred -Image CentOS85Gen2 -DomainNameLabel $domainNameLabel -SshKeyname $sshKeyName -generateSshkey
52665266

52675267
$vm = Get-AzVm -ResourceGroupName $rgname -Name $vmname
52685268
$sshKey = Get-AzSshKey -ResourceGroupName $rgname -Name $sshKeyName

‎src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StrategiesVirtualMachineTests/TestSimpleNewVmWithDefaultDomainName2.json

Lines changed: 1314 additions & 5511 deletions
Large diffs are not rendered by default.

‎src/Compute/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
-->
2222
## Upcoming Release
2323
* Added update functionality in `Update-AzVmss` for parameters `SecurityType`, `EnableSecureBoot`, and `EnableVtpm` for the parameter set with the Put operation.
24+
* [Breaking change] Removed unversioned and outdated linux image aliases of `CentOS`, `RHEL`, `UbuntuLTS` and `Debian`.
2425

2526
## Version 6.3.0
2627
* Added `-Hibernate` switch parameter to `Stop-AzVmss` default parameter set.

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
{
22
"Linux": {
3-
"CentOS": {
4-
"publisher": "OpenLogic",
5-
"offer": "CentOS",
6-
"sku": "7.5",
7-
"version": "latest"
8-
},
93
"CentOS85Gen2": {
104
"publisher": "OpenLogic",
115
"offer": "CentOS",
126
"sku": "8_5-gen2",
137
"version": "latest"
148
},
15-
"Debian": {
16-
"publisher": "credativ",
17-
"offer": "Debian",
18-
"sku": "8",
19-
"version": "latest"
20-
},
219
"Debian11": {
2210
"publisher": "Debian",
2311
"offer": "debian-11",
@@ -30,12 +18,6 @@
3018
"sku": "gen2",
3119
"version": "latest"
3220
},
33-
"RHEL": {
34-
"publisher": "RedHat",
35-
"offer": "RHEL",
36-
"sku": "7-RAW",
37-
"version": "latest"
38-
},
3921
"RHELRaw8LVMGen2": {
4022
"publisher": "RedHat",
4123
"offer": "RHEL",
@@ -48,12 +30,6 @@
4830
"sku": "gen2",
4931
"version": "latest"
5032
},
51-
"UbuntuLTS": {
52-
"publisher": "Canonical",
53-
"offer": "UbuntuServer",
54-
"sku": "16.04-LTS",
55-
"version": "latest"
56-
},
5733
"Ubuntu2204": {
5834
"publisher": "Canonical",
5935
"offer": "0001-com-ubuntu-server-jammy",

‎src/Compute/Compute/help/New-AzVM.md

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ This command creates a VM from a marketplace image without a Public IP.
190190

191191
### Example 4: Create a VM with a UserData value:
192192
```powershell
193-
## VM Account
193+
# VM Account
194194
$VMLocalAdminUser = "LocalAdminUser";
195195
$VMLocalAdminSecurePassword = ConvertTo-SecureString "Password" -AsPlainText -Force;
196196
197-
## Azure Account
197+
# Azure Account
198198
$LocationName = "eastus";
199199
$ResourceGroupName = "MyResourceGroup";
200200
@@ -209,7 +209,7 @@ $bytes = [System.Text.Encoding]::Unicode.GetBytes($text);
209209
$userData = [Convert]::ToBase64String($bytes);
210210
211211
# Create VM
212-
New-AzVM -ResourceGroupName $ResourceGroupName -Name $VMName -Credential $cred -DomainNameLabel $domainNameLabel -UserData $userData;
212+
New-AzVM -ResourceGroupName $ResourceGroupName -Name $VMName -Credential $Credential -DomainNameLabel $domainNameLabel -UserData $userData;
213213
$vm = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $VMName -UserData;
214214
```
215215

@@ -236,19 +236,23 @@ This example deploys a Windows VM from the marketplace in one resource group wit
236236

237237
### Example 6: Creating a new VM as part of a VMSS with a PlatformFaultDomain value.
238238
```powershell
239-
$resourceGroupName= "Resource Group Name"
240-
$domainNameLabel = "Domain Name Label Name"
241-
$vmname = "Virtual Machine Name"
242-
$platformFaultDomainVMDefaultSet = 2
243-
$securePassword = "Password" | ConvertTo-SecureString -AsPlainText -Force
244-
$user = "Username"
245-
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword)
246-
$vmssName = "Vmss Name";
239+
$resourceGroupName= "ResourceGroupName";
240+
$loc = 'eastus';
241+
New-AzResourceGroup -Name $resourceGroupName -Location $loc -Force;
242+
243+
$domainNameLabel = "d1" + $resourceGroupName;
244+
$vmname = "vm" + $resourceGroupName;
245+
$platformFaultDomainVMDefaultSet = 2;
246+
$vmssFaultDomain = 3;
247+
$securePassword = <PASSWORD> | ConvertTo-SecureString -AsPlainText -Force;
248+
$user = <USERNAME>;
249+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
250+
$vmssName = "vmss" + $resourceGroupName;
247251
248252
$vmssConfig = New-AzVmssConfig -Location $loc -PlatformFaultDomainCount $vmssFaultDomain;
249253
$vmss = New-AzVmss -ResourceGroupName $resourceGroupName -Name $vmssName -VirtualMachineScaleSet $vmssConfig;
250254
251-
$vm = New-AzVM -ResourceGroupName $resourceGroupName -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -PlatformFaultDomain $platformFaultDomainVMDefaultSet -VmssId $vmss.Id
255+
$vm = New-AzVM -ResourceGroupName $resourceGroupName -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -PlatformFaultDomain $platformFaultDomainVMDefaultSet -VmssId $vmss.Id;
252256
```
253257

254258
This example creates a new VM as part of a VMSS with a PlatformFaultDomain value.
@@ -329,14 +333,14 @@ $securePassword = "<Password>" | ConvertTo-SecureString -AsPlainText -Force
329333
$user = "<Username>"
330334
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword)
331335
332-
New-AzResourceGroup -Name $rgname -Location $loc -Force
336+
New-AzResourceGroup -Name $resourceGroupName -Location $loc -Force
333337
334338
# Create a VM using an Image alias.
335-
$vmname = 'v' + $rgname
336-
$domainNameLabel = "d" + $rgname
337-
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Credential $cred -Image OpenSuseLeap154Gen2 -DomainNameLabel $domainNameLabel
339+
$vmname = 'v' + $resourceGroupName
340+
$domainNameLabel = "d" + $resourceGroupName
341+
$vm = New-AzVM -ResourceGroupName $resourceGroupName -Name $vmname -Credential $cred -Image OpenSuseLeap154Gen2 -DomainNameLabel $domainNameLabel
338342
339-
$vm = Get-AzVM -ResourceGroupName $rgname -Name $vmname
343+
$vm = Get-AzVM -ResourceGroupName $resourceGroupName -Name $vmname
340344
```
341345

342346
This example creates a new VM using the -Image parameter, providing many default values to the VM.
@@ -757,7 +761,7 @@ Accept wildcard characters: False
757761
```
758762
759763
### -Image
760-
The friendly image name upon which the VM will be built. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, UbuntuLTS, Ubuntu2204, CentOS, CentOS85Gen2, Debian, Debian11, OpenSuseLeap154Gen2, RHEL, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.
764+
The friendly image name upon which the VM will be built. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, Ubuntu2204, CentOS85Gen2, Debian11, OpenSuseLeap154Gen2, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.
761765
762766
```yaml
763767
Type: System.String

‎src/Compute/Compute/help/New-AzVmss.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ $subnetId = $vnet.Subnets[0].Id;
228228
$vmssName = 'vmss' + $rgname;
229229
$vmssType = 'Microsoft.Compute/virtualMachineScaleSets';
230230
$adminUsername = <USER NAME>;
231-
$adminPassword = <PASSWORD> | ConvertTo-SecureString -AsPlainText -Force;
231+
$adminPassword = <PASSWORD>;
232232
$imgRef = New-Object -TypeName 'Microsoft.Azure.Commands.Compute.Models.PSVirtualMachineImage';
233233
$imgRef.PublisherName = $PublisherName;
234234
$imgRef.Offer = $Offer;
@@ -578,7 +578,7 @@ Accept wildcard characters: False
578578
```
579579
580580
### -ImageName
581-
The alias of the image for VMs in this Scale Set. If no value is provided, the "Windows Server 2016 DataCenter" image will be used. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, UbuntuLTS, Ubuntu2204, CentOS, CentOS85Gen2, Debian, Debian11, OpenSuseLeap154Gen2, RHEL, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.
581+
The alias of the image for VMs in this Scale Set. If no value is provided, the "Windows Server 2016 DataCenter" image will be used. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, UbuntuLTS, Ubuntu2204, CentOS85Gen2, Debian11, OpenSuseLeap154Gen2, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.
582582
583583
```yaml
584584
Type: System.String

‎src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/A2ATestsHelper.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function createAzureVm{
200200
$domain = "domain"+ $seed
201201
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
202202
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
203-
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain
203+
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain
204204
return $vm.Id
205205
}
206206

@@ -217,7 +217,7 @@ function createAzureVmInProximityPlacementgroup{
217217
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
218218
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
219219
$ppg = New-AzProximityPlacementGroup -ResourceGroupName $vmName -Name $VMName -Location $VMLocation
220-
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain -ProximityPlacementGroupId $ppg.Id
220+
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain -ProximityPlacementGroupId $ppg.Id
221221
return $vm.Id
222222
}
223223

@@ -233,7 +233,7 @@ function createAzureVmForCRG{
233233
$domain = "domain"+ $seed
234234
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
235235
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
236-
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain -Size "Standard_Ds1_v2"
236+
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain -Size "Standard_Ds1_v2"
237237
return $vm.Id
238238
}
239239

@@ -251,7 +251,7 @@ function createAzureVmInAvailabilityZone{
251251
$domain = "domain"+ $seed
252252
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
253253
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
254-
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain -Zone $VMZone
254+
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain -Zone $VMZone
255255
return $vm.Id
256256
}
257257

0 commit comments

Comments
 (0)