Skip to content

Update mac Helix queues #64565

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
merged 4 commits into from
Feb 3, 2022
Merged

Update mac Helix queues #64565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bebeb57
Update mac Helix queues
agocke Jan 31, 2022
0293e67
Adjust test to account for Mac RID changes
agocke Feb 1, 2022
c5b86d1
Disable DllImport probing test on Mac
agocke Feb 2, 2022
d69b5b9
Disable profiler.multiple on Mac
agocke Feb 3, 2022
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
11 changes: 5 additions & 6 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

# iOS/tvOS simulator x64/x86
- ${{ if in(parameters.platform, 'iOSSimulator_x64', 'tvOSSimulator_x64') }}:
- OSX.1015.Amd64.Open
- OSX.1200.Amd64.Open

# Android arm64
- ${{ if in(parameters.platform, 'Android_arm64') }}:
Expand Down Expand Up @@ -106,17 +106,16 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'OSX_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- OSX.1100.ARM64.Open
- OSX.1200.ARM64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1100.ARM64
- OSX.1200.ARM64

# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.1014.Amd64.Open
- OSX.1200.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1014.Amd64
- OSX.1015.Amd64
- OSX.1200.Amd64

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
11 changes: 4 additions & 7 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,11 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'OSX_arm64') }}:
- OSX.1100.ARM64.Open
- OSX.1200.ARM64.Open

# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- OSX.1014.Amd64.Open
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- OSX.1015.Amd64.Open
- OSX.1200.Amd64.Open
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we no longer have a diff between extra platforms for OSX_x64 I would recommend removing the OSX_64 legs that run libraries tests:

runtime/eng/pipelines/runtime-extra-platforms.yml

Line 87 in 09f681f

- OSX_x64

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not opposed, but I'd rather do it in a different PR, in case it causes unrelated problems.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What worries me to delay it to a different PR is that usually those TODOs get delayed or slip on the backlog and we will just be wasting resources that are useful on the extra-platforms run.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or at least if it is a subsequent PR you'll do in the next day or so, I don't mind.


# Android
- ${{ if in(parameters.platform, 'Android_x86', 'Android_x64') }}:
Expand All @@ -108,11 +105,11 @@ jobs:

# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'MacCatalyst_arm64', 'iOSSimulator_arm64') }}:
- OSX.1100.ARM64.Open
- OSX.1200.ARM64.Open

# iOS/tvOS simulator x64/x86 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iOSSimulator_x64', 'iOSSimulator_x86', 'tvOSSimulator_x64', 'MacCatalyst_x64') }}:
- OSX.1015.Amd64.Open
- OSX.1200.Amd64.Open

# iOS devices
- ${{ if in(parameters.platform, 'iOS_arm64') }}:
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ public void OSVersion_ValidVersion_OSX()
Version version = Environment.OSVersion.Version;

// verify that the Environment.OSVersion.Version matches the current RID
Assert.Contains(version.ToString(2), RuntimeInformation.RuntimeIdentifier);
// As of 12.0, only major version numbers are included in the RID
Assert.Contains(version.ToString(1), RuntimeInformation.RuntimeIdentifier);

Assert.True(version.Build >= 0, "OSVersion Build should be non-negative");
Assert.Equal(-1, version.Revision); // Revision is never set on OSX
Expand Down
16 changes: 10 additions & 6 deletions src/tests/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class Test

[DllImport(UnicodeFileName, EntryPoint = "GetZero")]
private static extern int GetZero_Unicode();

[DllImport(PathEnvFileName, EntryPoint = "GetZero")]
private static extern int GetZero_PathEnv();

Expand Down Expand Up @@ -83,7 +83,7 @@ static void TestNativeLibraryProbingOnRelativePath()
bool isWindows = OperatingSystem.IsWindows();

if (!isWindows) // We need to ensure that the subdirectory exists for off-Windows.
{
{
var currentDirectory = Directory.GetCurrentDirectory();
var info = new DirectoryInfo(currentDirectory);
info.CreateSubdirectory(RelativeSubdirectoryName);
Expand All @@ -97,12 +97,12 @@ static void TestNativeLibraryProbingOnRelativePath()
{
GetZero_Relative1Unix();
}

if (OperatingSystem.IsWindows())
{
GetZero_Relative2();
}

if (isWindows)
{
GetZero_Relative3Windows();
Expand Down Expand Up @@ -150,7 +150,7 @@ private static void SetupUnicodeTest()
localFile.Extension == ".dll"
|| localFile.Extension == ".so"
|| localFile.Extension == ".dylib");

var unicodeFileLocation = file.FullName.Replace("DllImportPath_Local", UnicodeFileName);

file.CopyTo(unicodeFileLocation, true);
Expand Down Expand Up @@ -178,7 +178,11 @@ public static int Main(string[] args)
{
TestNativeLibraryProbingUnicode();
}
TestNativeLibraryProbingOnPathEnv();
// Setting LD_LIBRARY_PATH/DYLD_LIBRARY_PATH may not be allowed on Mac
if (!OperatingSystem.IsMacOS())
{
TestNativeLibraryProbingOnPathEnv();
}
if (OperatingSystem.IsWindows())
{
TestNativeExeProbing();
Expand Down
7 changes: 6 additions & 1 deletion src/tests/profiler/multiple/multiple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MultiplyLoaded
[DllImport("Profiler")]
private static extern void PassCallbackToProfiler(ProfilerCallback callback);

public static int RunTest(String[] args)
public static int RunTest(String[] args)
{
ManualResetEvent _profilerDone = new ManualResetEvent(false);
PassCallbackToProfiler(() => _profilerDone.Set());
Expand Down Expand Up @@ -45,6 +45,11 @@ public static int RunTest(String[] args)

public static int Main(string[] args)
{
// failing on MacOs 12 https://github.com/dotnet/runtime/issues/64765
if (OperatingSystem.IsMacOS())
{
return 100;
}
if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
{
return RunTest(args);
Expand Down