Skip to content

Commit b27b298

Browse files
authored
[Android] Move linux-bionic leg to runtime-extra-platforms (#74621)
This change moves linux-bionic out of the runtime-staging pipeline and into runtime-extra-platforms. The effect is that all linux-bionic runs will be post PR unless triggered manually.
1 parent 8c965ec commit b27b298

File tree

3 files changed

+43
-41
lines changed

3 files changed

+43
-41
lines changed

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,47 @@ jobs:
412412
eq(variables['monoContainsChange'], true),
413413
eq(variables['isRollingBuild'], true))
414414
415+
#
416+
# Build the whole product using Mono for Android Linux with Bionic libc
417+
#
418+
- template: /eng/pipelines/common/platform-matrix.yml
419+
parameters:
420+
jobTemplate: /eng/pipelines/common/global-build-job.yml
421+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
422+
buildConfig: Release
423+
runtimeFlavor: mono
424+
platforms:
425+
- Linux_bionic_arm64
426+
- Linux_bionic_x64
427+
variables:
428+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
429+
- name: _HelixSource
430+
value: pr/dotnet/runtime/$(Build.SourceBranch)
431+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
432+
- name: _HelixSource
433+
value: ci/dotnet/runtime/$(Build.SourceBranch)
434+
- name: timeoutPerTestInMinutes
435+
value: 60
436+
- name: timeoutPerTestCollectionInMinutes
437+
value: 180
438+
jobParameters:
439+
testGroup: innerloop
440+
targetRid: Linux-bionic-x64
441+
nameSuffix: AllSubsets_Mono
442+
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
443+
timeoutInMinutes: 240
444+
condition: >-
445+
or(
446+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
447+
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
448+
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
449+
eq(variables['isRollingBuild'], true))
450+
# extra steps, run tests
451+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
452+
extraStepsParameters:
453+
creator: dotnet-bot
454+
testRunNamePrefixSuffix: Mono_$(_BuildConfig)_LinuxBionic
455+
415456
#
416457
# Build the whole product using Mono and run runtime tests
417458
# Build Mono release

eng/pipelines/runtime-staging.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -97,47 +97,6 @@ jobs:
9797
creator: dotnet-bot
9898
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
9999

100-
#
101-
# Build the whole product using Mono for Android Linux with Bionic libc
102-
#
103-
- template: /eng/pipelines/common/platform-matrix.yml
104-
parameters:
105-
jobTemplate: /eng/pipelines/common/global-build-job.yml
106-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
107-
buildConfig: Release
108-
runtimeFlavor: mono
109-
platforms:
110-
- Linux_bionic_arm64
111-
- Linux_bionic_x64
112-
variables:
113-
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
114-
- name: _HelixSource
115-
value: pr/dotnet/runtime/$(Build.SourceBranch)
116-
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
117-
- name: _HelixSource
118-
value: ci/dotnet/runtime/$(Build.SourceBranch)
119-
- name: timeoutPerTestInMinutes
120-
value: 60
121-
- name: timeoutPerTestCollectionInMinutes
122-
value: 180
123-
jobParameters:
124-
testGroup: innerloop
125-
targetRid: Linux-bionic-x64
126-
nameSuffix: AllSubsets_Mono
127-
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
128-
timeoutInMinutes: 240
129-
condition: >-
130-
or(
131-
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
132-
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
133-
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
134-
eq(variables['isRollingBuild'], true))
135-
# extra steps, run tests
136-
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
137-
extraStepsParameters:
138-
creator: dotnet-bot
139-
testRunNamePrefixSuffix: Mono_$(_BuildConfig)_LinuxBionic
140-
141100
#
142101
# Build the whole product using Mono for Android and run runtime tests with Android devices
143102
#

src/libraries/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.UnixDomainSockets.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class NamedPipeTest_UnixDomainSockets
1212
[Fact]
1313
[PlatformSpecific(TestPlatforms.AnyUnix)]
1414
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "iOS/tvOS blocks binding to UNIX sockets")]
15+
[SkipOnPlatform(TestPlatforms.LinuxBionic, "SElinux blocks UNIX sockets in our CI environment")]
1516
public void NamedPipeServer_Connects_With_UnixDomainSocketEndPointClient()
1617
{
1718
string pipeName = Path.Combine(Path.GetTempPath(), "pipe-tests-corefx-" + Path.GetRandomFileName());
@@ -30,6 +31,7 @@ public void NamedPipeServer_Connects_With_UnixDomainSocketEndPointClient()
3031
[Fact]
3132
[PlatformSpecific(TestPlatforms.AnyUnix)]
3233
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "iOS/tvOS blocks binding to UNIX sockets")]
34+
[SkipOnPlatform(TestPlatforms.LinuxBionic, "SElinux blocks UNIX sockets in our CI environment")]
3335
public async Task NamedPipeClient_Connects_With_UnixDomainSocketEndPointServer()
3436
{
3537
string pipeName = Path.Combine(Path.GetTempPath(), "pipe-tests-corefx-" + Path.GetRandomFileName());

0 commit comments

Comments
 (0)