[CI] Use stage names and clean the triggers. (#11461)
Add stage names to the templates to use them in triggers in the future. Remove a yaml file that turned out not to be needed (via a hack around vsts limitations).
This commit is contained in:
Родитель
6eb60b9f74
Коммит
05e2a460c7
|
@ -46,7 +46,8 @@ parameters:
|
|||
{
|
||||
devicePrefix: 'iOS32b',
|
||||
execute: 'runDevice32b',
|
||||
stageName: 'iOS32b Device Tests',
|
||||
stageName: 'ios32b_device',
|
||||
displayName: 'iOS32b Device Tests',
|
||||
iOSDevicePool: 'VSEng-Xamarin-QA',
|
||||
useXamarinStorage: False,
|
||||
testsLabels: '--label=run-ios-32-tests,run-non-monotouch-tests,run-monotouch-tests,run-mscorlib-tests',
|
||||
|
@ -56,7 +57,8 @@ parameters:
|
|||
{
|
||||
devicePrefix: 'iOS64',
|
||||
execute: 'runDevice64b',
|
||||
stageName: 'iOS64 Device Tests',
|
||||
stageName: 'ios64b_device',
|
||||
displayName: 'iOS64 Device Tests',
|
||||
iOSDevicePool: 'VSEng-Xamarin-Mac-Devices',
|
||||
useXamarinStorage: False,
|
||||
testsLabels: '--label=run-ios-64-tests,run-non-monotouch-tests,run-monotouch-tests,run-mscorlib-tests',
|
||||
|
@ -66,7 +68,8 @@ parameters:
|
|||
{
|
||||
devicePrefix: 'tvos',
|
||||
execute: 'runDeviceTv',
|
||||
stageName: 'tvOS Device Tests',
|
||||
stageName: 'tvos_device',
|
||||
displayName: 'tvOS Device Tests',
|
||||
iOSDevicePool: 'VSEng-Xamarin-Mac-Devices',
|
||||
useXamarinStorage: False,
|
||||
testsLabels: '--label=run-tvos-tests,run-non-monotouch-tests,run-monotouch-tests,run-mscorlib-tests',
|
||||
|
@ -78,21 +81,24 @@ parameters:
|
|||
type: object
|
||||
default: [
|
||||
{
|
||||
stageName: 'Mac Catalina (10.15)',
|
||||
stageName: 'mac_10_15',
|
||||
displayName: 'Mac Catalina (10.15)',
|
||||
macPool: 'VSEng-Xamarin-RedmondMacBuildPool-iOS-Trusted',
|
||||
osVersion: '10.15',
|
||||
statusContext: 'Mac Catalina (10.15)',
|
||||
checkDemands: true
|
||||
},
|
||||
{
|
||||
stageName: 'Mac Mojave (10.14)',
|
||||
stageName: 'mac_10_14',
|
||||
displayName: 'Mac Mojave (10.14)',
|
||||
macPool: 'Hosted Mac Internal Mojave',
|
||||
osVersion: '10.14',
|
||||
statusContext: 'Mac Mojave (10.14)',
|
||||
checkDemands: false
|
||||
},
|
||||
{
|
||||
stageName: 'Mac High Sierra (10.13)',
|
||||
stageName: 'mac_10_13',
|
||||
displayName: 'Mac High Sierra (10.13)',
|
||||
macPool: 'Hosted Mac Internal',
|
||||
osVersion: '10.13',
|
||||
statusContext: 'Mac High Sierra (10.13)',
|
||||
|
@ -239,6 +245,7 @@ stages:
|
|||
devicePrefix: ${{ config['devicePrefix'] }}
|
||||
execute: ${{ config['execute'] }}
|
||||
stageName: ${{ config['stageName'] }}
|
||||
displayName: ${{ config['displayName'] }}
|
||||
iOSDevicePool: ${{ config['iOSDevicePool'] }}
|
||||
useXamarinStorage: ${{ config['useXamarinStorage'] }}
|
||||
testsLabels: ${{ config['testsLabels'] }}
|
||||
|
@ -253,6 +260,7 @@ stages:
|
|||
- template: templates/mac/stage.yml
|
||||
parameters:
|
||||
stageName: ${{ config['stageName'] }}
|
||||
displayName: ${{ config['displayName'] }}
|
||||
macPool: ${{ config['macPool'] }}
|
||||
osVersion: ${{ config['osVersion'] }}
|
||||
statusContext: ${{ config['statusContext'] }}
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
# YAML pipeline for publishing the test results as a static gitbub page in a different
|
||||
# repository:
|
||||
# This pipeline will trigger in a succesful build of a build with a ciBuild tag.
|
||||
|
||||
trigger: none
|
||||
pr: none
|
||||
|
||||
resources:
|
||||
repositories:
|
||||
- repository: self
|
||||
checkoutOptions:
|
||||
submodules: false # no need
|
||||
|
||||
- repository: macios.ci
|
||||
type: github
|
||||
name: xamarin/macios.ci
|
||||
ref: refs/heads/main # get main and create the branch from main
|
||||
endpoint: xamarin
|
||||
|
||||
pipelines:
|
||||
- pipeline: macios
|
||||
source: xamarin-macios
|
||||
trigger: true # always do trigger
|
||||
tags:
|
||||
- ciBuild # used to identify builds for PRS, this is a workaround to get it working within vsts limits
|
||||
|
||||
variables:
|
||||
- group: xamops-azdev-secrets
|
||||
- group: Xamarin-Secrets
|
||||
- group: Xamarin Release
|
||||
- name: GitHub.Token # Override the GitHub.Token setting defined in the Xamarin Release group
|
||||
value: $(github--pat--vs-mobiletools-engineering-service2) # Use a token dedicated to critical production workflows and help avoid GitHub throttling
|
||||
- name: AzDoBuildAccess.Token
|
||||
value: $(pat--xamarinc--build-access)
|
||||
- name: system.debug
|
||||
value: true
|
||||
|
||||
|
||||
jobs:
|
||||
- job: publish_results
|
||||
displayName: Publish Results
|
||||
pool:
|
||||
vmImage: ubuntu-latest
|
||||
workspace:
|
||||
clean: all
|
||||
|
||||
steps:
|
||||
- template: templates/publish-html-result.yml
|
||||
parameters:
|
||||
reason: 'ci'
|
|
@ -17,12 +17,14 @@ resources:
|
|||
ref: refs/heads/main # get main and create the branch from main
|
||||
endpoint: xamarin
|
||||
|
||||
# we need all stages to be completed, else we do not have the test results, this trigger is just for CI, because we have
|
||||
# but because we have device issues, and it needs to be gree to trigger, we will deal with it later
|
||||
pipelines:
|
||||
- pipeline: macios
|
||||
source: xamarin-macios
|
||||
trigger: true # always do trigger
|
||||
tags:
|
||||
- prBuild # used to identify builds for PRS, this is a workaround to get it working within vsts limits
|
||||
trigger:
|
||||
stages:
|
||||
- build_packages
|
||||
|
||||
variables:
|
||||
- group: xamops-azdev-secrets
|
||||
|
|
|
@ -39,6 +39,9 @@ parameters:
|
|||
- name: stageName
|
||||
type: string
|
||||
|
||||
- name: displayName
|
||||
type: string
|
||||
|
||||
- name: keyringPass
|
||||
type: string
|
||||
|
||||
|
@ -56,8 +59,8 @@ parameters:
|
|||
type: string
|
||||
|
||||
stages:
|
||||
- stage:
|
||||
displayName: ${{ parameters.stageName }}
|
||||
- stage: ${{ parameters.stageName }}
|
||||
displayName: ${{ parameters.displayName }}
|
||||
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
|
||||
|
|
|
@ -6,6 +6,9 @@ parameters:
|
|||
- name: stageName
|
||||
type: string
|
||||
|
||||
- name: displayName
|
||||
type: string
|
||||
|
||||
- name: statusContext
|
||||
type: string
|
||||
default: '10.16'
|
||||
|
@ -21,8 +24,8 @@ parameters:
|
|||
default: true
|
||||
|
||||
stages:
|
||||
- stage:
|
||||
displayName: ${{ parameters.stageName }}
|
||||
- stage: ${{ parameters.stageName }}
|
||||
displayName: ${{ parameters.displayName }}
|
||||
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
|
||||
|
|
Загрузка…
Ссылка в новой задаче