Skip to content

Commit a89cc5f

Browse files
vatsan-madhavanmsftbot[bot]
authored andcommitted
Change _TestHelixAgentPool from 19H1 to RS5 (#975)
* Change _TestHelixAgentPool from 19H1 to RS5 * - Further restric the Agent Pools to Windows.10.Amd64.CleintRS5 - this is the only one that seems immune to timeouts - Limit Helix test runs to the open build pipline. Do not repeat the same tests in the internal pipeline. * Setting build timeout to 120 mins
1 parent e3d2643 commit a89cc5f

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,5 @@ jobs:
3636
queue: buildpool.windows.10.amd64.vs2019.pre
3737
# runAsPublic is used in expressions, which can't read from user-defined variables
3838
runAsPublic: false
39+
timeoutInMinutes: 120 # how long to run the job before automatically cancelling; see https://github.com/dotnet/wpf/issues/952
40+

eng/pipeline.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: _PlatformArgs
5151
value: /p:Platform=$(_Platform)
5252
- name: _TestHelixAgentPool
53-
value: 'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.Client19H1.Open'
53+
value: 'Windows.10.Amd64.ClientRS5.Open' # Preferred:'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'; See https://github.com/dotnet/wpf/issues/952
5454
- name: _HelixStagingDir
5555
value: $(BUILD.STAGINGDIRECTORY)\helix\functests
5656
- name: _HelixSource
@@ -59,6 +59,8 @@ jobs:
5959
value: ''
6060
- name: _HelixCreator
6161
value: ${{ parameters.repoName }}
62+
- name: _HelixPublicBuildPipeline # Run Helix tests when building in the open, do not repeat when building and publishign again using the internal build-pipeline
63+
value: true
6264

6365
# Override some values if we're building internally
6466
- ${{ if eq(parameters.runAsPublic, 'false') }}:
@@ -97,7 +99,9 @@ jobs:
9799
- name: _HelixCreator
98100
value: '' #if _HelixToken is set, Creator must be empty
99101
- name: _TestHelixAgentPool
100-
value: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.Client19H1'
102+
value: 'Windows.10.Amd64.ClientRS5' # Preferred: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.ClientRS5'
103+
- name: _HelixPublicBuildPipeline
104+
value: false
101105
strategy:
102106
matrix:
103107
Build_Debug_x86:
@@ -152,4 +156,4 @@ jobs:
152156
HelixAccessToken: $(_HelixToken) # only defined for internal CI
153157
Creator: $(_HelixCreator)
154158
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
155-
condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
159+
condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true')) # on helix machine (with real signing) when running on the public build pipeline

0 commit comments

Comments
 (0)