From 7126b4f3101dd31bc17f9d2f4aeacf42b2357375 Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Mon, 11 May 2020 20:38:20 -0400 Subject: [PATCH 1/2] Add alias CoreClrTestBuildHost Intended to allow easy switching of test build host between OSX_x64 & Linux_x64 depending on availablility and reliability. --- eng/pipelines/common/platform-matrix.yml | 2 +- eng/pipelines/coreclr/ci.yml | 2 +- eng/pipelines/coreclr/crossgen2-composite.yml | 3 ++- eng/pipelines/coreclr/crossgen2-outerloop.yml | 3 ++- eng/pipelines/coreclr/crossgen2.yml | 3 ++- eng/pipelines/coreclr/gc-longrunning.yml | 3 ++- eng/pipelines/coreclr/gc-simulator.yml | 3 ++- eng/pipelines/coreclr/gcstress-extra.yml | 4 ++-- eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml | 4 ++-- eng/pipelines/coreclr/jit-experimental.yml | 4 ++-- eng/pipelines/coreclr/jitstress-isas-arm.yml | 4 ++-- eng/pipelines/coreclr/jitstress-isas-x86.yml | 3 ++- eng/pipelines/coreclr/jitstress.yml | 3 ++- eng/pipelines/coreclr/jitstress2-jitstressregs.yml | 3 ++- eng/pipelines/coreclr/jitstressregs-x86.yml | 4 ++-- eng/pipelines/coreclr/jitstressregs.yml | 3 ++- eng/pipelines/coreclr/r2r-extra.yml | 4 ++-- eng/pipelines/coreclr/r2r.yml | 4 ++-- eng/pipelines/coreclr/release-tests.yml | 2 +- eng/pipelines/coreclr/runincontext.yml | 3 ++- eng/pipelines/runtime.yml | 4 ++-- 21 files changed, 39 insertions(+), 29 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 5b5f8baba750b5..39866387e12b93 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -372,7 +372,7 @@ jobs: # macOS x64 -- ${{ if or(containsValue(parameters.platforms, 'OSX_x64'), eq(parameters.platformGroup, 'all')) }}: +- ${{ if or(containsValue(parameters.platforms, 'OSX_x64'), containsValue(parameters.platforms, 'CoreClrTestBuildHost'), eq(parameters.platformGroup, 'all')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index 39815649bfe23f..51bb6e746eb644 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -97,7 +97,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 testGroup: outerloop jobParameters: liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/crossgen2-composite.yml b/eng/pipelines/coreclr/crossgen2-composite.yml index 93fe34bec25990..a941ee33dffb1b 100644 --- a/eng/pipelines/coreclr/crossgen2-composite.yml +++ b/eng/pipelines/coreclr/crossgen2-composite.yml @@ -24,6 +24,7 @@ jobs: - Linux_x64 - OSX_x64 - Windows_NT_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop @@ -32,7 +33,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index f898956ead36af..c674469e411a91 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -24,6 +24,7 @@ jobs: - Linux_x64 - OSX_x64 - Windows_NT_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop @@ -32,7 +33,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index e48984961ac12f..e20ebb4152b999 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -24,6 +24,7 @@ jobs: - Linux_x64 - OSX_x64 - Windows_NT_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop @@ -32,7 +33,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index c922d7c72aa8fd..c2dc2e07dfd11f 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -26,6 +26,7 @@ jobs: - Windows_NT_x64 - Windows_NT_arm64 - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gc-longrunning @@ -34,7 +35,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: release platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gc-longrunning liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/gc-simulator.yml b/eng/pipelines/coreclr/gc-simulator.yml index 9465e5e9eb31bb..3b32c9a78acc98 100644 --- a/eng/pipelines/coreclr/gc-simulator.yml +++ b/eng/pipelines/coreclr/gc-simulator.yml @@ -27,6 +27,7 @@ jobs: - Windows_NT_x64 - Windows_NT_arm64 - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gc-simulator @@ -35,7 +36,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: release platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gc-simulator diff --git a/eng/pipelines/coreclr/gcstress-extra.yml b/eng/pipelines/coreclr/gcstress-extra.yml index 12c94ca82e630e..244b103c167945 100644 --- a/eng/pipelines/coreclr/gcstress-extra.yml +++ b/eng/pipelines/coreclr/gcstress-extra.yml @@ -22,7 +22,7 @@ jobs: buildConfig: checked platformGroup: gcstress platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress-extra @@ -31,7 +31,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress-extra diff --git a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml index f56966fe33ce44..74a1f3f795c4f7 100644 --- a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml @@ -22,7 +22,7 @@ jobs: buildConfig: checked platformGroup: gcstress platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress0x3-gcstress0xc @@ -31,7 +31,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress0x3-gcstress0xc diff --git a/eng/pipelines/coreclr/jit-experimental.yml b/eng/pipelines/coreclr/jit-experimental.yml index 9aed6f86265f27..61f96331ec6ff1 100644 --- a/eng/pipelines/coreclr/jit-experimental.yml +++ b/eng/pipelines/coreclr/jit-experimental.yml @@ -23,7 +23,7 @@ jobs: platforms: - Linux_x64 - Windows_NT_x64 - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jit-experimental @@ -32,7 +32,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jit-experimental diff --git a/eng/pipelines/coreclr/jitstress-isas-arm.yml b/eng/pipelines/coreclr/jitstress-isas-arm.yml index b1b8f39af438f6..ac2975bd23c818 100644 --- a/eng/pipelines/coreclr/jitstress-isas-arm.yml +++ b/eng/pipelines/coreclr/jitstress-isas-arm.yml @@ -23,7 +23,7 @@ jobs: platforms: - Linux_arm64 - Windows_NT_arm64 - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-arm @@ -32,7 +32,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-arm diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index b9ee908628b360..98beca7b6fa792 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -25,6 +25,7 @@ jobs: - OSX_x64 - Windows_NT_x64 - Windows_NT_x86 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-x86 @@ -33,7 +34,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-x86 liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/jitstress.yml b/eng/pipelines/coreclr/jitstress.yml index c8e31c6aea42de..48b16241901128 100644 --- a/eng/pipelines/coreclr/jitstress.yml +++ b/eng/pipelines/coreclr/jitstress.yml @@ -30,6 +30,7 @@ jobs: - Windows_NT_x86 - Windows_NT_arm - Windows_NT_arm64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress @@ -38,7 +39,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress diff --git a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml index 36809694db50ff..2b054603d3a8e9 100644 --- a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml @@ -30,6 +30,7 @@ jobs: - Windows_NT_x86 - Windows_NT_arm - Windows_NT_arm64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress2-jitstressregs @@ -38,7 +39,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: checked diff --git a/eng/pipelines/coreclr/jitstressregs-x86.yml b/eng/pipelines/coreclr/jitstressregs-x86.yml index 5afcbab6b52b95..8357f5bed44762 100644 --- a/eng/pipelines/coreclr/jitstressregs-x86.yml +++ b/eng/pipelines/coreclr/jitstressregs-x86.yml @@ -24,7 +24,7 @@ jobs: - Linux_x64 - Windows_NT_x64 - Windows_NT_x86 - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs-x86 @@ -33,7 +33,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs-x86 diff --git a/eng/pipelines/coreclr/jitstressregs.yml b/eng/pipelines/coreclr/jitstressregs.yml index 61d5821a1aa697..e72369e6026b9a 100644 --- a/eng/pipelines/coreclr/jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstressregs.yml @@ -30,6 +30,7 @@ jobs: - Windows_NT_x86 - Windows_NT_arm - Windows_NT_arm64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs @@ -38,7 +39,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs diff --git a/eng/pipelines/coreclr/r2r-extra.yml b/eng/pipelines/coreclr/r2r-extra.yml index 2408de7eb47238..b1fcee1c070611 100644 --- a/eng/pipelines/coreclr/r2r-extra.yml +++ b/eng/pipelines/coreclr/r2r-extra.yml @@ -22,7 +22,7 @@ jobs: buildConfig: checked platformGroup: gcstress platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: r2r-extra @@ -31,7 +31,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: r2r-extra diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index 4a470719b8ee4a..b8e5d6e59f3b09 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -26,7 +26,7 @@ jobs: - Linux_x64 - Windows_NT_x64 - Windows_NT_x86 - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop @@ -35,7 +35,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop diff --git a/eng/pipelines/coreclr/release-tests.yml b/eng/pipelines/coreclr/release-tests.yml index 966a4319345b0a..77567d88f1720d 100644 --- a/eng/pipelines/coreclr/release-tests.yml +++ b/eng/pipelines/coreclr/release-tests.yml @@ -35,7 +35,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: release platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/runincontext.yml b/eng/pipelines/coreclr/runincontext.yml index e3127b571fa788..08fd6c74aeed3b 100644 --- a/eng/pipelines/coreclr/runincontext.yml +++ b/eng/pipelines/coreclr/runincontext.yml @@ -24,6 +24,7 @@ jobs: - Linux_x64 - Windows_NT_x64 - Windows_NT_x86 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop @@ -32,7 +33,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index fa7a353c6bf6a7..e7ab4e2fc9a7ea 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -606,7 +606,7 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} @@ -666,7 +666,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - OSX_x64 + - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} From f7908c2cae31cc94d9ebc9725489567847d53f73 Mon Sep 17 00:00:00 2001 From: Jarret Shook Date: Mon, 11 May 2020 13:01:19 -0700 Subject: [PATCH 2/2] Setup pr and batch runs for dev/infrsatructure (#36218) --- eng/pipelines/runtime.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e7ab4e2fc9a7ea..307cc24bbca69b 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -7,6 +7,7 @@ trigger: branches: include: - master + - dev/infrastructure - release/*.* paths: include: @@ -27,6 +28,7 @@ pr: branches: include: - master + - dev/infrastructure - release/*.* paths: include: