diff options
author | William Godbe <wigodbe@microsoft.com> | 2019-03-19 12:12:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-19 12:12:21 -0700 |
commit | 75b082485ddf041eacba42afc77d9b5180e67a84 (patch) | |
tree | e792a1a244aeb026c6070a44bd3fdac288ef44df /azure-pipelines.yml | |
parent | bf8dc39d78fddae7e107fc4cc020ad94c984675b (diff) | |
parent | b07cc29e0ab47747a71f9ef3c482b14188a502c5 (diff) | |
download | coreclr-75b082485ddf041eacba42afc77d9b5180e67a84.tar.gz coreclr-75b082485ddf041eacba42afc77d9b5180e67a84.tar.bz2 coreclr-75b082485ddf041eacba42afc77d9b5180e67a84.zip |
Merge pull request #23308 from dotnet-maestro-bot/merge/master-to-release/3.0
[automated] Merge branch 'master' => 'release/3.0'
Diffstat (limited to 'azure-pipelines.yml')
-rw-r--r-- | azure-pipelines.yml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cfa115e159..b1ef2dac13 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -140,8 +140,8 @@ jobs: # Checked test builds # -# Pull request -- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: +# The jobs that can be triggered in PR, manually from ADO and that are scheduled +- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest', 'Manual', 'Schedule')) }}: - template: eng/platform-matrix.yml parameters: jobTemplate: test-job.yml @@ -177,15 +177,6 @@ jobs: readyToRun: true testGroup: outerloop -# Schedule or Manual -- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule', 'Manual')) }}: - - template: eng/platform-matrix.yml - parameters: - jobTemplate: test-job.yml - buildConfig: checked - jobParameters: - testGroup: outerloop - # # Release test builds # |