@@ -4,7 +4,7 @@ parameters:
4
4
device : ' ' # the xharness device to use
5
5
apiversion : ' ' # the iOS device api version to use
6
6
cakeArgs : ' ' # additional cake args
7
- androidConfiguration : ' ' # Indicates the configuration to use for Android. We're slowly enabling this for all projects
7
+ deviceTestConfiguration : ' ' # Indicates the configuration to use for Android. We're slowly enabling this for all projects
8
8
provisionatorChannel : ' latest'
9
9
agentPoolAccessToken : ' '
10
10
artifactName : ' nuget'
@@ -95,41 +95,20 @@ steps:
95
95
continueOnError: true
96
96
timeoutInMinutes: 5
97
97
98
- # Everything should be release but doing android for now to work around an xharness issue
99
- - ${{ if eq(parameters.platform, 'android')}} :
100
- - pwsh : |
101
- ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --configuration=${{ parameters.androidConfiguration }}
102
- displayName: $(Agent.JobName)
103
- workingDirectory: ${{ parameters.checkoutDirectory }}
104
- condition: and(succeeded(), ne(variables['Platform.Name'], 'Mac'))
105
- retryCountOnTaskFailure: 1
106
-
107
- - ${{ if eq(parameters.platform, 'android')}} :
108
- - bash : |
109
- # Execute the powershell script from a bash shell on Mac to avoid interference between powershell processes that lead to this error: The STDIO streams did not close within 10 seconds of the exit event from process '/usr/local/bin/pwsh'. This may indicate a child process inherited the STDIO streams and has not yet exited.
110
- pwsh ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --configuration=${{ parameters.androidConfiguration }}
111
- displayName: $(Agent.JobName)
112
- workingDirectory: ${{ parameters.checkoutDirectory }}
113
- condition: and(succeeded(), eq(variables['Platform.Name'], 'Mac'))
114
- retryCountOnTaskFailure: 1
115
-
116
- - ${{ if ne(parameters.platform, 'android')}} :
117
- - pwsh : |
118
- ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}
119
- displayName: $(Agent.JobName)
120
- workingDirectory: ${{ parameters.checkoutDirectory }}
121
- condition: and(succeeded(), ne(variables['Platform.Name'], 'Mac'))
122
- retryCountOnTaskFailure: 1
123
-
124
- - ${{ if ne(parameters.platform, 'android')}} :
125
- - bash : |
126
- # Execute the powershell script from a bash shell on Mac to avoid interference between powershell processes that lead to this error: The STDIO streams did not close within 10 seconds of the exit event from process '/usr/local/bin/pwsh'. This may indicate a child process inherited the STDIO streams and has not yet exited.
127
- pwsh ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }}
128
- displayName: $(Agent.JobName)
129
- workingDirectory: ${{ parameters.checkoutDirectory }}
130
- condition: and(succeeded(), eq(variables['Platform.Name'], 'Mac'))
131
- retryCountOnTaskFailure: 1
132
- # Everything should be release but doing android for now to work around an xharness issue
98
+ - pwsh : |
99
+ ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --configuration=${{ parameters.deviceTestConfiguration }}
100
+ displayName: $(Agent.JobName)
101
+ workingDirectory: ${{ parameters.checkoutDirectory }}
102
+ condition: and(succeeded(), ne(variables['Platform.Name'], 'Mac'))
103
+ retryCountOnTaskFailure: 1
104
+
105
+ - bash : |
106
+ # Execute the powershell script from a bash shell on Mac to avoid interference between powershell processes that lead to this error: The STDIO streams did not close within 10 seconds of the exit event from process '/usr/local/bin/pwsh'. This may indicate a child process inherited the STDIO streams and has not yet exited.
107
+ pwsh ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --project="${{ parameters.path }}" --device=${{ parameters.device }} --apiversion=${{ parameters.apiversion }} --packageid=${{ parameters.windowsPackageId }} --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --configuration=${{ parameters.deviceTestConfiguration }}
108
+ displayName: $(Agent.JobName)
109
+ workingDirectory: ${{ parameters.checkoutDirectory }}
110
+ condition: and(succeeded(), eq(variables['Platform.Name'], 'Mac'))
111
+ retryCountOnTaskFailure: 1
133
112
134
113
- ${{ if eq(parameters.platform, 'ios')}} :
135
114
- bash : |
0 commit comments