Skip to content

Commit 03fb12c

Browse files
JoeRobichJoeRobich
authored
Update integration test variables
1 parent 4aa43a4 commit 03fb12c

4 files changed

+114
-44
lines changed

‎azure-pipelines-integration-corehost.yml

+26-8
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,34 @@ pr:
4848
- CONTRIBUTING.md
4949
- README.md
5050

51-
variables:
51+
parameters:
52+
- name: poolName
53+
displayName: Pool Name
54+
type: string
55+
default: NetCore-Public
56+
values:
57+
- NetCore-Public
58+
- NetCore-Svc-Public
5259
- name: queueName
53-
value: windows.vs2022.amd64.open
60+
displayName: Queue Name
61+
type: string
62+
default: windows.vs2022preview.amd64.open
63+
values:
64+
- windows.vs2022.amd64.open
65+
- windows.vs2022.scout.amd64.open
66+
- windows.vs2022preview.amd64.open
67+
- windows.vs2022preview.scout.amd64.open
68+
- name: timeout
69+
displayName: Timeout in Minutes
70+
type: number
71+
default: 150
5472

5573
jobs:
5674
- job: VS_Integration_CoreHost_Debug
5775
pool:
58-
name: NetCore-Public
59-
demands: ImageOverride -equals $(queueName)
60-
timeoutInMinutes: 150
76+
name: ${{ parameters.poolName }}
77+
demands: ImageOverride -equals ${{ parameters.queueName }}
78+
timeoutInMinutes: ${{ parameters.timeout }}
6179
variables:
6280
- name: XUNIT_LOGS
6381
value: $(Build.SourcesDirectory)\artifacts\log\Debug
@@ -71,9 +89,9 @@ jobs:
7189
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
7290
- job: VS_Integration_CoreHost_Release
7391
pool:
74-
name: NetCore-Public
75-
demands: ImageOverride -equals $(queueName)
76-
timeoutInMinutes: 150
92+
name: ${{ parameters.poolName }}
93+
demands: ImageOverride -equals ${{ parameters.queueName }}
94+
timeoutInMinutes: ${{ parameters.timeout }}
7795
variables:
7896
- name: XUNIT_LOGS
7997
value: $(Build.SourcesDirectory)\artifacts\log\Debug

‎azure-pipelines-integration-lsp.yml

+25-5
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,38 @@ pr:
3434
- release/dev17.2
3535
- release/dev17.3
3636

37+
parameters:
38+
- name: poolName
39+
displayName: Pool Name
40+
type: string
41+
default: NetCore-Public
42+
values:
43+
- NetCore-Public
44+
- NetCore-Svc-Public
45+
- name: queueName
46+
displayName: Queue Name
47+
type: string
48+
default: windows.vs2022preview.amd64.open
49+
values:
50+
- windows.vs2022.amd64.open
51+
- windows.vs2022.scout.amd64.open
52+
- windows.vs2022preview.amd64.open
53+
- windows.vs2022preview.scout.amd64.open
54+
- name: timeout
55+
displayName: Timeout in Minutes
56+
type: number
57+
default: 150
58+
3759
variables:
3860
- name: XUNIT_LOGS
3961
value: $(Build.SourcesDirectory)\artifacts\log\$(_configuration)
40-
- name: queueName
41-
value: windows.vs2022preview.amd64.open
4262

4363
jobs:
4464
- job: VS_Integration_LSP
4565
pool:
46-
name: NetCore-Public
47-
demands: ImageOverride -equals $(queueName)
48-
timeoutInMinutes: 150
66+
name: ${{ parameters.poolName }}
67+
demands: ImageOverride -equals ${{ parameters.queueName }}
68+
timeoutInMinutes: ${{ parameters.timeout }}
4969

5070
steps:
5171
- template: eng/pipelines/test-integration-job.yml

‎azure-pipelines-integration.yml

+38-28
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,42 @@ pr:
4343
- CONTRIBUTING.md
4444
- README.md
4545
- src/Compilers/*
46-
47-
variables:
46+
47+
parameters:
4848
- name: poolName
49-
value: NetCore-Svc-Public
49+
displayName: Pool Name
50+
type: string
51+
default: NetCore-Public
52+
values:
53+
- NetCore-Public
54+
- NetCore-Svc-Public
5055
- name: queueName
51-
value: windows.vs2022preview.amd64.open
56+
displayName: Queue Name
57+
type: string
58+
default: windows.vs2022preview.amd64.open
59+
values:
60+
- windows.vs2022.amd64.open
61+
- windows.vs2022.scout.amd64.open
62+
- windows.vs2022preview.amd64.open
63+
- windows.vs2022preview.scout.amd64.open
64+
- name: timeout
65+
displayName: Timeout in Minutes
66+
type: number
67+
default: 150
5268

5369
stages:
5470
- stage: Debug_Integration
5571
dependsOn: []
72+
variables:
73+
- name: XUNIT_LOGS
74+
value: $(Build.SourcesDirectory)\artifacts\log\Debug
5675
jobs:
5776
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
5877
- job: VS_Integration_Debug_32
5978
pool:
60-
name: $(poolName)
61-
demands: ImageOverride -equals $(queueName)
62-
timeoutInMinutes: 150
63-
variables:
64-
- name: XUNIT_LOGS
65-
value: $(Build.SourcesDirectory)\artifacts\log\Debug
79+
name: ${{ parameters.poolName }}
80+
demands: ImageOverride -equals ${{ parameters.queueName }}
81+
timeoutInMinutes: ${{ parameters.timeout }}
6682
steps:
6783
- template: eng/pipelines/test-integration-job.yml
6884
parameters:
@@ -72,12 +88,9 @@ stages:
7288

7389
- job: VS_Integration_Debug_64
7490
pool:
75-
name: $(poolName)
76-
demands: ImageOverride -equals $(queueName)
77-
timeoutInMinutes: 150
78-
variables:
79-
- name: XUNIT_LOGS
80-
value: $(Build.SourcesDirectory)\artifacts\log\Debug
91+
name: ${{ parameters.poolName }}
92+
demands: ImageOverride -equals ${{ parameters.queueName }}
93+
timeoutInMinutes: ${{ parameters.timeout }}
8194
steps:
8295
- template: eng/pipelines/test-integration-job.yml
8396
parameters:
@@ -87,15 +100,15 @@ stages:
87100

88101
- stage: Release_Integration
89102
dependsOn: []
103+
variables:
104+
- name: XUNIT_LOGS
105+
value: $(Build.SourcesDirectory)\artifacts\log\Release
90106
jobs:
91107
- job: VS_Integration_Release_32
92108
pool:
93-
name: $(poolName)
94-
demands: ImageOverride -equals $(queueName)
95-
timeoutInMinutes: 150
96-
variables:
97-
- name: XUNIT_LOGS
98-
value: $(Build.SourcesDirectory)\artifacts\log\Release
109+
name: ${{ parameters.poolName }}
110+
demands: ImageOverride -equals ${{ parameters.queueName }}
111+
timeoutInMinutes: ${{ parameters.timeout }}
99112
steps:
100113
- template: eng/pipelines/test-integration-job.yml
101114
parameters:
@@ -106,12 +119,9 @@ stages:
106119
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
107120
- job: VS_Integration_Release_64
108121
pool:
109-
name: $(poolName)
110-
demands: ImageOverride -equals $(queueName)
111-
timeoutInMinutes: 150
112-
variables:
113-
- name: XUNIT_LOGS
114-
value: $(Build.SourcesDirectory)\artifacts\log\Release
122+
name: ${{ parameters.poolName }}
123+
demands: ImageOverride -equals ${{ parameters.queueName }}
124+
timeoutInMinutes: ${{ parameters.timeout }}
115125
steps:
116126
- template: eng/pipelines/test-integration-job.yml
117127
parameters:

‎azure-pipelines-richnav.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,36 @@ pr: none
1616
# - features/*
1717
# - demos/*
1818

19+
parameters:
20+
- name: poolName
21+
displayName: Pool Name
22+
type: string
23+
default: NetCore-Public
24+
values:
25+
- NetCore-Public
26+
- NetCore-Svc-Public
27+
- name: queueName
28+
displayName: Queue Name
29+
type: string
30+
default: windows.vs2022preview.amd64.open
31+
values:
32+
- windows.vs2022.amd64.open
33+
- windows.vs2022.scout.amd64.open
34+
- windows.vs2022preview.amd64.open
35+
- windows.vs2022preview.scout.amd64.open
36+
- name: timeout
37+
displayName: Timeout in Minutes
38+
type: number
39+
default: 260
40+
1941
jobs:
2042
- job: RichCodeNav_Indexing
2143
pool:
22-
name: NetCore-Public
23-
demands: ImageOverride -equals windows.vs2022preview.amd64.open
44+
name: ${{ parameters.poolName }}
45+
demands: ImageOverride -equals ${{ parameters.queueName }}
46+
timeoutInMinutes: ${{ parameters.timeout }}
2447
variables:
2548
EnableRichCodeNavigation: true
26-
timeoutInMinutes: 260
2749

2850
steps:
2951
- task: PowerShell@2

0 commit comments

Comments
 (0)