Skip to content

Commit a1e4a85

Browse files
yangpanMSyangpanMS
authored
Add support for AzLinux3 (#305)
* Fix issue in VC versioning * Add support for AzLinux 3 * Add support for AzLinux 3 * Remove reference in profiles
1 parent 1d6e010 commit a1e4a85

File tree

18 files changed

+70
-27
lines changed

18 files changed

+70
-27
lines changed

‎.pipelines/azure-pipelines-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resources:
1616
options: --entrypoint=""
1717

1818
variables:
19-
VcVersion : 1.14.21
19+
VcVersion : 1.14.22
2020
ROOT: $(Build.SourcesDirectory)
2121
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2222
ENABLE_PRS_DELAYSIGN: 1

‎.pipelines/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pool:
1818
vmImage: windows-latest
1919

2020
variables:
21-
VcVersion : 1.14.21
21+
VcVersion : 1.14.22
2222
ROOT: $(Build.SourcesDirectory)
2323
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2424
ENABLE_PRS_DELAYSIGN: 1

‎src/VirtualClient/VirtualClient.Actions/Gzip/GzipExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ private async Task CheckDistroSupportAsync(EventContext telemetryContext, Cancel
227227
case LinuxDistribution.Debian:
228228
case LinuxDistribution.CentOS8:
229229
case LinuxDistribution.RHEL8:
230-
case LinuxDistribution.Mariner:
230+
case LinuxDistribution.AzLinux:
231231
case LinuxDistribution.CentOS7:
232232
case LinuxDistribution.RHEL7:
233233
break;

‎src/VirtualClient/VirtualClient.Actions/Memcached/MemcachedExecutor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,14 @@ private async Task ValidatePlatformSupportAsync(CancellationToken cancellationTo
244244
case LinuxDistribution.Debian:
245245
case LinuxDistribution.CentOS8:
246246
case LinuxDistribution.RHEL8:
247-
case LinuxDistribution.Mariner:
247+
case LinuxDistribution.AzLinux:
248248
break;
249249
default:
250250
throw new WorkloadException(
251251
$"The workload/benchmark is not supported on the current Linux distro " +
252252
$"'{distroInfo.LinuxDistribution}'. Supported distros include: " +
253253
$"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.Ubuntu)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.Debian)}" +
254-
$"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.CentOS8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.RHEL8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.Mariner)}",
254+
$"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.CentOS8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.RHEL8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.AzLinux)}",
255255
ErrorReason.LinuxDistributionNotSupported);
256256
}
257257

‎src/VirtualClient/VirtualClient.Actions/Pbzip2/Pbzip2Executor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ private async Task CheckDistroSupportAsync(EventContext telemetryContext, Cancel
231231
case LinuxDistribution.Debian:
232232
case LinuxDistribution.CentOS8:
233233
case LinuxDistribution.RHEL8:
234-
case LinuxDistribution.Mariner:
234+
case LinuxDistribution.AzLinux:
235235
case LinuxDistribution.CentOS7:
236236
case LinuxDistribution.RHEL7:
237237
break;

‎src/VirtualClient/VirtualClient.Contracts.UnitTests/Examples/hostnamectl/AzLinux3Example.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Static hostname: omega
2+
Icon name: computer-vm
3+
Chassis: vm 🖴
4+
Machine ID: cf5e3269332149319128b5b09f03c002
5+
Boot ID: e28e22f759d8431da7f93d28cca0b10c
6+
Virtualization: qemu
7+
Operating System: Microsoft Azure Linux 3.0
8+
Kernel: Linux 6.6.22.1-2.azl3
9+
Architecture: arm64
10+
Hardware Vendor: QEMU
11+
Hardware Model: QEMU Virtual Machine
12+
Firmware Version: 0.0.0
13+
Firmware Date: Fri 2015-02-06
14+
Firmware Age: 9y 2month 3w 5d

‎src/VirtualClient/VirtualClient.Contracts.UnitTests/Examples/os-release/AzLinux3Example.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
NAME="Microsoft Azure Linux"
2+
VERSION="3.0.20240401"
3+
ID=azurelinux
4+
VERSION_ID="3.0"
5+
PRETTY_NAME="Microsoft Azure Linux 3.0"
6+
ANSI_COLOR="1;34"
7+
HOME_URL="https://aka.ms/azurelinux"
8+
BUG_REPORT_URL="https://aka.ms/azurelinux"
9+
SUPPORT_URL="https://aka.ms/azurelinux"

‎src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/HostnamectlParserUnitTests.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,25 @@ public void HostnamectlParserRecognizeCentOS8()
9696
}
9797

9898
[Test]
99-
public void HostnamectlParserRecognizeMariner()
99+
public void HostnamectlParserRecognizeMariner2()
100100
{
101101
string outputPath = Path.Combine(this.ExamplePath, "MarinerExample.txt");
102102
this.rawText = File.ReadAllText(outputPath);
103103
this.testParser = new HostnamectlParser(this.rawText);
104-
Assert.AreEqual(LinuxDistribution.Mariner, this.testParser.Parse().LinuxDistribution);
104+
Assert.AreEqual(LinuxDistribution.AzLinux, this.testParser.Parse().LinuxDistribution);
105105
Assert.AreEqual("CBL-Mariner/Linux", this.testParser.Parse().OperationSystemFullName);
106106
}
107107

108+
[Test]
109+
public void HostnamectlParserRecognizeAzLinux3()
110+
{
111+
string outputPath = Path.Combine(this.ExamplePath, "AzLinux3Example.txt");
112+
this.rawText = File.ReadAllText(outputPath);
113+
this.testParser = new HostnamectlParser(this.rawText);
114+
Assert.AreEqual(LinuxDistribution.AzLinux, this.testParser.Parse().LinuxDistribution);
115+
Assert.AreEqual("Microsoft Azure Linux 3.0", this.testParser.Parse().OperationSystemFullName);
116+
}
117+
108118
[Test]
109119
public void HostnamectlParserRecognizeSUSE()
110120
{

‎src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/OsReleaseFileParserUnitTests.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private string ExamplePath
2727
}
2828

2929
[Test]
30-
public void OsReleaseFileParserrRecognizeFedoraOS()
30+
public void OsReleaseFileParserRecognizeFedoraOS()
3131
{
3232
string outputPath = Path.Combine(this.ExamplePath, "FedoraOSExample.txt");
3333
this.rawText = File.ReadAllText(outputPath);
@@ -37,7 +37,7 @@ public void OsReleaseFileParserrRecognizeFedoraOS()
3737
}
3838

3939
[Test]
40-
public void OsReleaseFileParserrRecognizeUbuntu22()
40+
public void OsReleaseFileParserRecognizeUbuntu22()
4141
{
4242
string outputPath = Path.Combine(this.ExamplePath, "Ubuntu22Example.txt");
4343
this.rawText = File.ReadAllText(outputPath);
@@ -47,7 +47,7 @@ public void OsReleaseFileParserrRecognizeUbuntu22()
4747
}
4848

4949
[Test]
50-
public void OsReleaseFileParserrRecognizeDebian11()
50+
public void OsReleaseFileParserRecognizeDebian11()
5151
{
5252
string outputPath = Path.Combine(this.ExamplePath, "Debian11Example.txt");
5353
this.rawText = File.ReadAllText(outputPath);
@@ -57,13 +57,23 @@ public void OsReleaseFileParserrRecognizeDebian11()
5757
}
5858

5959
[Test]
60-
public void OsReleaseFileParserrRecognizeRHEL93()
60+
public void OsReleaseFileParserRecognizeRHEL93()
6161
{
6262
string outputPath = Path.Combine(this.ExamplePath, "RHEL93Example.txt");
6363
this.rawText = File.ReadAllText(outputPath);
6464
this.testParser = new OsReleaseFileParser(this.rawText);
6565
Assert.AreEqual(LinuxDistribution.RHEL8, this.testParser.Parse().LinuxDistribution);
6666
Assert.AreEqual("Red Hat Enterprise Linux 9.3 (Plow)", this.testParser.Parse().OperationSystemFullName);
6767
}
68+
69+
[Test]
70+
public void OsReleaseFileParserRecognizeAzLinux3()
71+
{
72+
string outputPath = Path.Combine(this.ExamplePath, "AzLinux3Example.txt");
73+
this.rawText = File.ReadAllText(outputPath);
74+
this.testParser = new OsReleaseFileParser(this.rawText);
75+
Assert.AreEqual(LinuxDistribution.AzLinux, this.testParser.Parse().LinuxDistribution);
76+
Assert.AreEqual("Microsoft Azure Linux 3.0", this.testParser.Parse().OperationSystemFullName);
77+
}
6878
}
6979
}

‎src/VirtualClient/VirtualClient.Contracts/Enumerations.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,9 @@ public enum LinuxDistribution
541541
Fedora,
542542

543543
/// <summary>
544-
/// MSFT internal CentOS based distro Mariner
544+
/// MSFT internal CentOS based distro AzLinux (Previously Mariner)
545545
/// </summary>
546-
Mariner
546+
AzLinux
547547
}
548548

549549
/// <summary>

0 commit comments

Comments
 (0)