[ci] Don't AzurePipelines for uitest templates (#20436)

dotnet · Feb 8, 2024 · 792f1f8 · 792f1f8
1 parent ce80f53
commit 792f1f8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
@@ -50,7 +50,7 @@ steps:
 
     - pwsh: ./build.ps1 --target=dotnet-local-workloads --verbosity=diagnostic
       displayName: 'Install .NET (Local Workloads)'
-      retryCountOnTaskFailure: 3
+      retryCountOnTaskFailure: 2
       workingDirectory: ${{ parameters.checkoutDirectory }}
       env:
         DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
@@ -76,15 +76,15 @@ steps:
     displayName: $(Agent.JobName)
     workingDirectory: ${{ parameters.checkoutDirectory }}
     condition: and(succeeded(), ne(variables['Platform.Name'], 'Mac'))
-    retryCountOnTaskFailure: 2
+    retryCountOnTaskFailure: 1
 
   - bash: |
       # 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.
       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 }}
     displayName: $(Agent.JobName)
     workingDirectory: ${{ parameters.checkoutDirectory }}
     condition: and(succeeded(), eq(variables['Platform.Name'], 'Mac'))
-    retryCountOnTaskFailure: 2
+    retryCountOnTaskFailure: 1
 
   - task: PublishTestResults@2
     displayName: Publish the $(Agent.JobName) test results

diff --git a/eng/pipelines/common/ui-tests-steps.yml b/eng/pipelines/common/ui-tests-steps.yml
@@ -101,7 +101,7 @@ steps:
 
   - pwsh: ./build.ps1 -Script eng/devices/${{ parameters.platform }}.cake --target=uitest --project="${{ parameters.path }}" --appproject="${{ parameters.app }}" --device="${{ parameters.device }}" --apiversion="${{ parameters.version }}" --configuration="${{ parameters.configuration }}" --results="$(TestResultsDirectory)" --binlog="$(LogDirectory)" ${{ parameters.cakeArgs }} --verbosity=diagnostic
     displayName: $(Agent.JobName)
-    retryCountOnTaskFailure: 2
+    retryCountOnTaskFailure: 1
 
   - task: PublishTestResults@2
     displayName: Publish the $(System.PhaseName) test results

diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
@@ -129,8 +129,6 @@ parameters:
     default:
       - name: default
         tfm: default
-      # - name: net6
-      #   tfm: net6.0
       - name: net8
         tfm: net8.0
 
@@ -304,4 +302,4 @@ stages:
           enableCodeInspector: true
           apiScanEnabled: true
           apiScanSoftwareName: 'MAUI'
-          apiScanSoftwareVersionNum: 8.0
+          apiScanSoftwareVersionNum: 8.0
diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
@@ -73,8 +73,11 @@ parameters:
   - name: iosPool
     type: object
     default:
-      name: $(macosTestsVmPool)
-      vmImage: $(macosTestsVmImage)
+      name: $(iosTestsVmPool)
+      vmImage: $(iosTestsVmImage)
+      demands:
+        - macOS.Name -equals Ventura
+        - macOS.Architecture -equals x64
 
   - name: windowsPool
     type: object