diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2019-02-14 08:17:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 08:17:52 -0800 |
| commit | 4424340fe19ecc81429133ab7e13f37816ed8005 (patch) | |
| tree | ae250f3e9855cf2cfed3d0a5e9b98cd6801f04d9 /eng | |
| parent | 9d932bb6af40e78c83d98ed280465c7024884d52 (diff) | |
| download | coreclr-4424340fe19ecc81429133ab7e13f37816ed8005.tar.gz coreclr-4424340fe19ecc81429133ab7e13f37816ed8005.tar.bz2 coreclr-4424340fe19ecc81429133ab7e13f37816ed8005.zip | |
Don't use $(_HelixSource) and $(_HelixType) in test-job.yml (#22589)
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/test-job.yml | 26 | ||||
| -rw-r--r-- | eng/xplat-job.yml | 2 |
2 files changed, 16 insertions, 12 deletions
diff --git a/eng/test-job.yml b/eng/test-job.yml index 4c8d9978b7..483ad0809a 100644 --- a/eng/test-job.yml +++ b/eng/test-job.yml @@ -35,11 +35,6 @@ jobs: crossrootfsDir: ${{ parameters.crossrootfsDir }} - ${{ if eq(parameters.readyToRun, false) }}: - helixType: ${{ format('test/functional/cli/pri{0}', parameters.priority) }} - ${{ if eq(parameters.readyToRun, true) }}: - helixType: ${{ format('test/functional/r2r/cli/pri{0}', parameters.priority) }} - variables: - group: DotNet-HelixApi-Access # Map template parameters to command line arguments @@ -131,9 +126,23 @@ jobs: archType: ${{ parameters.archType }} osGroup: ${{ parameters.osGroup }} + ${{ if eq(variables['System.TeamProject'], 'public') }}: + creator: 'coreclr' + helixBuild: $(Build.BuildNumber) - helixSource: $(_HelixSource) - helixType: $(_HelixType) + + ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: + helixSource: official/dotnet/coreclr/$(Build.SourceBranch) + ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: + helixSource: pr/dotnet/coreclr/$(Build.SourceBranch) + ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}: + helixSource: ci/dotnet/coreclr/$(Build.SourceBranch) + + ${{ if eq(parameters.readyToRun, false) }}: + helixType: ${{ format('test/functional/cli/pri{0}', parameters.priority) }} + ${{ if eq(parameters.readyToRun, true) }}: + helixType: ${{ format('test/functional/r2r/cli/pri{0}', parameters.priority) }} + helixQueues: ${{ parameters.helixQueues.asString }} ${{ if eq(parameters.helixQueues.asString, '') }}: @@ -150,7 +159,4 @@ jobs: # DotNet-HelixApi-Access variable group helixAccessToken: $(HelixApiAccessToken) - ${{ if eq(variables['System.TeamProject'], 'public') }}: - creator: coreclr-pulls - scenarios: ${{ parameters.scenarios.asString }} diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index 806509df78..a743e1078f 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -9,7 +9,6 @@ parameters: dependsOn: '' containerName: '' timeoutInMinutes: '' - helixType: '' crossrootfsDir: '' enableMicrobuild: '' @@ -30,7 +29,6 @@ jobs: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} helixRepo: 'dotnet/coreclr' - helixType: ${{ parameters.helixType }} enableMicrobuild: ${{ parameters.enableMicrobuild }} |