From: Viktor Hofer Date: Wed, 30 Sep 2020 12:21:53 +0000 (+0200) Subject: Flow rid in yml jobs (#37652) X-Git-Tag: submit/tizen/20210909.063632~5271 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f98038aff88560fbd3c8883aebecd4a4c7894d3d;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Flow rid in yml jobs (#37652) --- diff --git a/eng/pipelines/common/build-coreclr-and-libraries-job.yml b/eng/pipelines/common/build-coreclr-and-libraries-job.yml index 439d970..6fa606b 100644 --- a/eng/pipelines/common/build-coreclr-and-libraries-job.yml +++ b/eng/pipelines/common/build-coreclr-and-libraries-job.yml @@ -3,6 +3,7 @@ parameters: archType: '' osGroup: '' osSubgroup: '' + targetRid: '' container: '' testGroup: '' crossrootfsDir: '' @@ -21,6 +22,7 @@ jobs: archType: ${{ parameters.archType }} osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} + targetRid: ${{ parameters.targetRid }} container: ${{ parameters.container }} testGroup: ${{ parameters.testGroup }} crossrootfsDir: ${{ parameters.crossrootfsDir }} diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 221f8d3..e6a13ef 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -8,6 +8,7 @@ parameters: container: '' crossrootfsDir: '' variables: [] + targetRid: '' timeoutInMinutes: '' pool: '' condition: true @@ -92,6 +93,7 @@ jobs: buildConfig: ${{ parameters.buildConfig }} runtimeFlavor: ${{ parameters.runtimeFlavor }} helixQueues: ${{ parameters.helixQueues }} + targetRid: ${{ parameters.targetRid }} ${{ insert }}: ${{ parameters.extraStepsParameters }} - task: PublishBuildArtifacts@1 diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 04e7d31..44d52cb 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -35,6 +35,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Linux archType: arm + targetRid: linux-arm platform: Linux_arm container: image: ubuntu-16.04-cross-20200413125008-09ec757 @@ -59,6 +60,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Linux archType: arm64 + targetRid: linux-arm64 platform: Linux_arm64 container: image: ubuntu-16.04-cross-arm64-20200413125008-cfdd435 @@ -84,6 +86,7 @@ jobs: osGroup: Linux osSubgroup: _musl archType: x64 + targetRid: linux-musl-x64 platform: Linux_musl_x64 container: image: alpine-3.9-WithNode-20200602002639-0fc54a3 @@ -108,6 +111,7 @@ jobs: osGroup: Linux osSubgroup: _musl archType: arm + targetRid: linux-musl-arm platform: Linux_musl_arm container: image: ubuntu-18.04-cross-arm-alpine-20200818211451-14441ae @@ -133,6 +137,7 @@ jobs: osGroup: Linux osSubgroup: _musl archType: arm64 + targetRid: linux-musl-arm64 platform: Linux_musl_arm64 container: image: ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a @@ -157,6 +162,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Linux archType: x64 + targetRid: linux-x64 platform: Linux_x64 container: image: centos-7-359e48e-20200313130914 @@ -180,6 +186,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Browser archType: wasm + targetRid: browser-wasm platform: Browser_wasm container: image: ubuntu-18.04-webassembly-20200827125937-9740252 @@ -201,6 +208,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: FreeBSD archType: x64 + targetRid: freebsd-x64 platform: FreeBSD_x64 container: image: ubuntu-18.04-cross-freebsd-11-20200407092345-a84b0d2 @@ -224,6 +232,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Android archType: x64 + targetRid: android-x64 platform: Android_x64 container: image: ubuntu-18.04-android-20200422191843-e2c3f83 @@ -247,6 +256,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Android archType: x86 + targetRid: android-x86 platform: Android_x86 container: image: ubuntu-18.04-android-20200422191843-e2c3f83 @@ -270,6 +280,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Android archType: arm + targetRid: android-arm platform: Android_arm container: image: ubuntu-18.04-android-20200422191843-e2c3f83 @@ -293,6 +304,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Android archType: arm64 + targetRid: android-arm64 platform: Android_arm64 container: image: ubuntu-18.04-android-20200422191843-e2c3f83 @@ -316,6 +328,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: tvOS archType: x64 + targetRid: tvos-x64 platform: tvOS_x64 jobParameters: runtimeFlavor: mono @@ -336,6 +349,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: tvOS archType: arm64 + targetRid: tvos-arm64 platform: tvOS_arm64 jobParameters: runtimeFlavor: mono @@ -356,6 +370,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: iOS archType: x64 + targetRid: ios-x64 platform: iOS_x64 jobParameters: runtimeFlavor: mono @@ -376,6 +391,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: iOS archType: x86 + targetRid: ios-x86 platform: iOS_x86 jobParameters: runtimeFlavor: mono @@ -397,6 +413,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: iOS archType: arm + targetRid: ios-arm platform: iOS_arm jobParameters: runtimeFlavor: mono @@ -417,6 +434,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: iOS archType: arm64 + targetRid: ios-arm64 platform: iOS_arm64 jobParameters: runtimeFlavor: mono @@ -437,6 +455,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: OSX archType: x64 + targetRid: osx-x64 platform: OSX_x64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} @@ -457,6 +476,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Windows_NT archType: x64 + targetRid: win-x64 platform: Windows_NT_x64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} @@ -477,6 +497,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Windows_NT archType: x86 + targetRid: win-x86 platform: Windows_NT_x86 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} @@ -496,6 +517,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Windows_NT archType: arm + targetRid: win-arm platform: Windows_NT_arm jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} @@ -516,6 +538,7 @@ jobs: variables: ${{ parameters.variables }} osGroup: Windows_NT archType: arm64 + targetRid: win-arm64 platform: Windows_NT_arm64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index bd7e5d0..0a3d6cd 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -6,6 +6,7 @@ parameters: container: '' helixQueuesTemplate: '' platform: '' + targetRid: '' jobParameters: {} variables: [] @@ -92,6 +93,7 @@ jobs: osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} + targetRid: ${{ parameters.targetRid }} platform: ${{ parameters.platform }} ${{ if ne(parameters.container, '') }}: diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index 6a70952..fc704bf 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -3,6 +3,7 @@ parameters: osGroup: '' osSubgroup: '' archType: '' + targetRid: '' crossrootfsDir: '' framework: 'net5.0' isOfficialBuild: false @@ -134,6 +135,7 @@ jobs: - template: /eng/pipelines/libraries/helix.yml parameters: osGroup: ${{ parameters.osGroup }} + targetRid: ${{ parameters.targetRid }} archType: ${{ parameters.archType }} buildConfig: ${{ parameters.buildConfig }} helixQueues: ${{ parameters.helixQueues }} diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index c0c5873..02f2086 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -5,6 +5,7 @@ parameters: creator: '' helixQueues: '' osGroup: '' + targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all interpreter: '' @@ -17,6 +18,7 @@ steps: $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj /p:RuntimeFlavor=${{ parameters.runtimeFlavor }} /p:TargetArchitecture=${{ parameters.archType }} + /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} /p:TargetOS=${{ parameters.osGroup }} /p:MonoEnableInterpreter=${{ parameters.interpreter }} diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index 58bcd93..9175425 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -3,6 +3,7 @@ parameters: osGroup: '' osSubgroup: '' archType: '' + targetRid: '' framework: 'net5.0' isOfficialBuild: false liveRuntimeBuildConfig: '' @@ -113,6 +114,7 @@ jobs: parameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} osGroup: ${{ parameters.osGroup }} + targetRid: ${{ parameters.targetRid }} archType: ${{ parameters.archType }} buildConfig: ${{ parameters.buildConfig }} helixQueues: ${{ parameters.helixQueues }} diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index a2804bc..599a940 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -30,6 +30,7 @@ TargetArchitecture=$(TargetArchitecture); Configuration=$(Configuration); TargetOS=$(TargetOS); + TargetRuntimeIdentifier=$(TargetRuntimeIdentifier); TestRunNamePrefixSuffix=$(TestRunNamePrefixSuffix); Creator=$(Creator); HelixAccessToken=$(HelixAccessToken);