Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PR pipeline #5656

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions azure-pipelines-arcade-PR.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
parameters:
- name: _RunWithCoreWcfService
displayName: Run tests using CoreWCF service
type: boolean
default: false

# trigger ci builds for merged PRs into listed branches
# Setting batch to true, triggers one build at a time.
# if there is a push while a build in progress, it will wait,
Expand Down Expand Up @@ -37,7 +31,8 @@ variables:
value: true
- name: _RunAsInternal
value: false

- name: _RunWithCoreWcfService
value: false
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: _RunAsPublic
value: false
Expand Down Expand Up @@ -115,7 +110,7 @@ stages:
Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"

displayName: Update _updateService variable
condition: and(eq(variables._RunAsPublic, True), ne('${{ parameters._RunWithCoreWcfService }}', True))
condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))

- ${{ if eq(variables._RunAsPublic, True) }}:
- template: /eng/UpdatePRService.yml
Expand All @@ -138,7 +133,7 @@ stages:
-projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
$(_TestArgs)
/p:TestJob=Windows
/p:RunWithCoreWcfService=${{ parameters._RunWithCoreWcfService }}
/p:RunWithCoreWcfService=$(variables._RunWithCoreWcfService)
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
displayName: Windows - Run Helix Tests
env:
Expand Down Expand Up @@ -187,7 +182,7 @@ stages:
Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"

displayName: Update _updateService variable
condition: and(eq(variables._RunAsPublic, True), ne('${{ parameters._RunWithCoreWcfService }}', True))
condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))

- template: /eng/UpdatePRService.yml
parameters:
Expand All @@ -207,7 +202,7 @@ stages:
--projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
$(_TestArgs)
/p:TestJob=Linux
/p:RunWithCoreWcfService=${{ parameters._RunWithCoreWcfService }}
/p:RunWithCoreWcfService=$(variables._RunWithCoreWcfService)
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
displayName: Linux - Run Helix Tests
env:
Expand Down Expand Up @@ -254,7 +249,7 @@ stages:
Write-Host "##vso[task.setvariable variable=_serviceUri]wcfcoresrv23.westus3.cloudapp.azure.com/WcfService$(_WcfPRServiceId)"

displayName: Update _updateService variable
condition: and(eq(variables._RunAsPublic, True), ne('${{ parameters._RunWithCoreWcfService }}', True))
condition: and(eq(variables._RunAsPublic, True), ne(variables._RunWithCoreWcfService, True))

- template: /eng/UpdatePRService.yml
parameters:
Expand All @@ -274,7 +269,7 @@ stages:
-projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
$(_TestArgs)
/p:TestJob=MacOS
/p:RunWithCoreWcfService=${{ parameters._RunWithCoreWcfService }}
/p:RunWithCoreWcfService=$(variables._RunWithCoreWcfService)
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
displayName: MacOS - Run Helix Tests
env:
Expand Down
Loading