@@ -31,9 +31,6 @@ variables:
3131 value : true
3232 - name : _RunAsInternal
3333 value : false
34- - name : _RunWithCoreWcfService
35- value : false
36-
3734 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }} :
3835 - name : _RunAsPublic
3936 value : false
@@ -77,13 +74,12 @@ stages:
7774 - _TestArgs : /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true
7875
7976 # Public/PR & CI Build Variables
80- - ${{ if eq(variables._RunAsPublic, True) }} :
81- # For PR and CI test runs we use a different server machine that host multiple services to avoid concurrency issues.
82- - _serviceUri : wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)
83- # For PR and CI test runs we need to update the Service being used by Scenario tests.
84- # Used in UpdatePRService.yml
85- # I think this can be removed based on the logic, setting it to true for now.
86- - _updateService : true
77+ # For PR and CI test runs we use a different server machine that host multiple services to avoid concurrency issues.
78+ - _serviceUri :
79+ # For PR and CI test runs we need to update the Service being used by Scenario tests.
80+ # Used in UpdatePRService.yml
81+ # I think this can be removed based on the logic, setting it to true for now.
82+ - _updateService : false
8783
8884 # Send to Helix variables
8985 - _xUnitWorkItemTimeout : ' 00:10:00'
@@ -107,7 +103,14 @@ stages:
107103 steps :
108104 - checkout : self
109105 clean : true
110- - ${{ if and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True)) }} :
106+ - powershell : |
107+ Write-Host "##vso[task.setvariable variable=_updateService]true"
108+ Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"
109+
110+ displayName: Update _updateService variable
111+ condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))
112+
113+ ${{ if eq(variables._RunAsPublic, True) }} :
111114 - template : /eng/UpdatePRService.yml
112115 parameters :
113116 wcfPRServiceId : $(_WcfPRServiceId)
@@ -128,7 +131,7 @@ stages:
128131 -projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
129132 $(_TestArgs)
130133 /p:TestJob=Windows
131- /p:RunWithCoreWcfService=$(_RunWithCoreWcfService)
134+ /p:RunWithCoreWcfService=$($Env: _RunWithCoreWcfService)
132135 /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
133136 displayName : Windows - Run Helix Tests
134137 env :
@@ -149,8 +152,8 @@ stages:
149152 demands : ImageOverride -equals build.Ubuntu.1804.Amd64.Open
150153 variables :
151154 - _TestArgs : /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true
152- - _serviceUri : wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)
153- - _updateService : true
155+ - _serviceUri :
156+ - _updateService : false
154157
155158 # Send to Helix variables
156159 - _xUnitWorkItemTimeout : ' 00:10:00'
@@ -172,10 +175,16 @@ stages:
172175 steps :
173176 - checkout : self
174177 clean : true
175- - ${{ if and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True)) }} :
176- - template : /eng/UpdatePRService.yml
177- parameters :
178- wcfPRServiceId : $(_WcfPRServiceId)
178+ - powershell : |
179+ Write-Host "##vso[task.setvariable variable=_updateService]true"
180+ Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"
181+
182+ displayName: Update _updateService variable
183+ condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))
184+
185+ template : /eng/UpdatePRService.yml
186+ parameters :
187+ wcfPRServiceId : $(_WcfPRServiceId)
179188 - script : eng/common/cibuild.sh
180189 -configuration $(_BuildConfig)
181190 -preparemachine
@@ -191,7 +200,7 @@ stages:
191200 --projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
192201 $(_TestArgs)
193202 /p:TestJob=Linux
194- /p:RunWithCoreWcfService=$(_RunWithCoreWcfService)
203+ /p:RunWithCoreWcfService=$($Env: _RunWithCoreWcfService)
195204 /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
196205 displayName : Linux - Run Helix Tests
197206 env :
@@ -210,8 +219,8 @@ stages:
210219 demands : ImageOverride -equals windows.vs2022.amd64.open
211220 variables :
212221 - _TestArgs : /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true
213- - _serviceUri : wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)
214- - _updateService : true
222+ - _serviceUri :
223+ - _updateService : false
215224
216225 # Send to Helix variables
217226 - _xUnitWorkItemTimeout : ' 00:10:00'
@@ -233,10 +242,16 @@ stages:
233242 steps :
234243 - checkout : self
235244 clean : true
236- - ${{ if and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True)) }} :
237- - template : /eng/UpdatePRService.yml
238- parameters :
239- wcfPRServiceId : $(_WcfPRServiceId)
245+ - powershell : |
246+ Write-Host "##vso[task.setvariable variable=_updateService]true"
247+ Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"
248+
249+ displayName: Update _updateService variable
250+ condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))
251+
252+ template : /eng/UpdatePRService.yml
253+ parameters :
254+ wcfPRServiceId : $(_WcfPRServiceId)
240255 - script : eng\common\cibuild.cmd
241256 -configuration $(_BuildConfig)
242257 -preparemachine
@@ -252,7 +267,7 @@ stages:
252267 -projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
253268 $(_TestArgs)
254269 /p:TestJob=MacOS
255- /p:RunWithCoreWcfService=$(_RunWithCoreWcfService)
270+ /p:RunWithCoreWcfService=$($Env: _RunWithCoreWcfService)
256271 /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
257272 displayName : MacOS - Run Helix Tests
258273 env :
0 commit comments