Skip to content

Commit e96a53f

Browse files
authored
Support internal pull requests (#9578)
- aspnet/AspNetCore-Internal#2231 - use internal pools for all internal builds - do not sign in builds for internal pull requests nits: - VSTS -> Azure DevOps - restore higher `maxParallel` values for E2E tests on Linux and Windows
1 parent 860071e commit e96a53f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.azure/pipelines/e2e-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
pool:
66
vmImage: vs2017-win2016
77
strategy:
8-
maxParallel: 4
8+
maxParallel: 8
99
matrix:
1010
Portable_Node8:
1111
Test.RuntimeIdentifier: none
@@ -87,7 +87,7 @@ jobs:
8787
pool:
8888
vmImage: ubuntu-16.04
8989
strategy:
90-
maxParallel: 4
90+
maxParallel: 8
9191
matrix:
9292
Portable_Node8:
9393
Test.RuntimeIdentifier: none

.azure/pipelines/jobs/default-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# jobDisplayName: string
77
# The friendly job name to display in the UI. Defaults to the name of the OS.
88
# poolName: string
9-
# The name of the VSTS agent queue to use.
9+
# The name of the Azure DevOps agent pool to use.
1010
# agentOs: string
1111
# Used in templates to define variables which are OS specific. Typically from the set { Windows, Linux, macOS }
1212
# buildArgs: string
@@ -77,10 +77,10 @@ jobs:
7777
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
7878
vmImage: ubuntu-16.04
7979
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
80-
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
80+
${{ if eq(variables['System.TeamProject'], 'public') }}:
8181
name: NetCorePublic-Int-Pool
8282
queue: BuildPool.Windows.10.Amd64.VS2017.Open
83-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
83+
${{ if ne(variables['System.TeamProject'], 'public') }}:
8484
name: NetCoreInternal-Int-Pool
8585
queue: BuildPool.Windows.10.Amd64.VS2017
8686
variables:
@@ -93,9 +93,9 @@ jobs:
9393
BuildDirectory: ${{ parameters.buildDirectory }}
9494
${{ if eq(parameters.agentOs, 'Windows') }}:
9595
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
96-
${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}:
96+
${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'PullRequest')) }}:
9797
_SignType:
98-
${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }}:
98+
${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}:
9999
TeamName: AspNetCore
100100
_SignType: real
101101
${{ insert }}: ${{ parameters.variables }}

0 commit comments

Comments
 (0)