[CI] Always execute older macOs tests. (#14366)

Always execute the older macOS tests since they do not take too much
time and we now do have the required resources.
This commit is contained in:
Manuel de la Pena 2022-03-11 21:43:41 -05:00 коммит произвёл GitHub
Родитель bcfad82211
Коммит 2586aa1541
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 17 добавлений и 18 удалений

Просмотреть файл

@ -359,24 +359,23 @@ stages:
parseLabels: false
- ${{ if eq(parameters.runOldMacOSTests, true) }}:
- ${{ if and(ne(variables['Build.Reason'], 'Schedule'), or(eq(variables['Build.Reason'], 'IndividualCI'), eq(variables['Build.Reason'], 'Manual'))) }}:
- ${{ each config in parameters.macTestsConfigurations }}:
- template: templates/mac/stage.yml
parameters:
stageName: ${{ config.stageName }}
displayName: ${{ config.displayName }}
macPool: ${{ config.macPool }}
useImage: ${{ config.useImage }}
statusContext: ${{ config.statusContext }}
keyringPass: $(pass--lab--mac--builder--keychain)
demands: ${{ config.demands }}
- template: templates/windows/stage.yml
- ${{ each config in parameters.macTestsConfigurations }}:
- template: templates/mac/stage.yml
parameters:
stageName: windows_integration
displayName: 'Windows Integration Tests'
pool: 'VSEng-Xamarin-Mac-Devices' # currently ignored until the VS team provides a real one
statusContext: 'Windows Integration Tests'
stageName: ${{ config.stageName }}
displayName: ${{ config.displayName }}
macPool: ${{ config.macPool }}
useImage: ${{ config.useImage }}
statusContext: ${{ config.statusContext }}
keyringPass: $(pass--lab--mac--builder--keychain)
demands: ${{ config.demands }}
- template: templates/windows/stage.yml
parameters:
stageName: windows_integration
displayName: 'Windows Integration Tests'
pool: 'VSEng-Xamarin-Mac-Devices' # currently ignored until the VS team provides a real one
statusContext: 'Windows Integration Tests'
# iOS 32b tests are slow and do not have many machines, for that reason we are going just to run them in the Schedule builds.
# This means we are going to get the translations AND the iOS 32b on those builds.

Просмотреть файл

@ -30,7 +30,7 @@ stages:
dependsOn:
- build_packages
# we need to have the pkgs built and the device sets to be ran, that is decided via the labels or type of build during the build_packages stage
condition: and(succeeded(), eq(dependencies.build_packages.outputs['build.configuration.RunDeviceTests'], 'True'))
condition: succeeded()
variables:
MAC_TESTS_PRESENT: $[ dependencies.build_packages.outputs['macTestPkg.macTestsPresent'] ]