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.

Sign up for GitHub

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

Continue if provisionator fails #11068

Merged
merged 6 commits into from
Nov 3, 2022
Merged

Continue if provisionator fails #11068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fc8ba2
Continue if provisionator fails
rmarinho Nov 2, 2022
4f1263c
Merge branch 'main' into provisionator-fixes
rmarinho Nov 3, 2022
54f59aa
Try not fail with agent-cleanser
rmarinho Nov 3, 2022
68df9a3
Centralize the agent-cleanser
rmarinho Nov 3, 2022
8ae637c
Remove extra agent-cleanser
rmarinho Nov 3, 2022
7148171
agent-cleanser is on provisionator.yml now
rmarinho Nov 3, 2022
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
6 changes: 0 additions & 6 deletions eng/pipelines/common/device-tests-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ parameters:
provisionatorChannel: 'latest'

steps:
- template: agent-cleanser/v1.yml@xamarin-templates
parameters:
UninstallMono: false
UninstallXamarinMac: false
CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline

- template: provision.yml
parameters:
platform: macos
Expand Down
6 changes: 0 additions & 6 deletions eng/pipelines/common/pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ parameters:
artifact: 'nuget'

steps:
- ${{ if eq(parameters.platform, 'macOS') }}:
- template: agent-cleanser/v1.yml@xamarin-templates
parameters:
UninstallMono: false
UninstallXamarinMac: false
CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
- template: provision.yml
parameters:
platform: ${{ parameters.platform }}
Expand Down
8 changes: 8 additions & 0 deletions eng/pipelines/common/provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ steps:

# Prepare macOS
- ${{ if eq(parameters.platform, 'macos') }}:
- template: agent-cleanser/v1.yml@xamarin-templates
parameters:
UninstallMono: false
UninstallXamarinMac: false
CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
SelfHealPowerShell: false
AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
# Provision Xcode
- ${{ if ne(parameters.skipXcode, 'true') }}:
- task: xamops.azdevex.provisionator-task.provisionator@1
Expand All @@ -33,6 +40,7 @@ steps:
- task: xamops.azdevex.provisionator-task.provisionator@1
displayName: 'Provision Additional Software'
condition: eq(variables['provisioning'], 'true')
continueOnError: true
inputs:
provisioning_script: $(provisionator.path)
provisioning_extra_args: $(provisionator.extraArguments)
Expand Down
19 changes: 1 addition & 18 deletions eng/pipelines/handlers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,6 @@ stages:
- Agent.HasDevices -equals False
- Agent.IsPaired -equals False
steps:
- ${{ if eq(BuildPlatform.name, 'macOS') }}:
- template: agent-cleanser/v1.yml@xamarin-templates
parameters:
UninstallMono: false
UninstallXamarinMac: false
CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
- template: common/provision.yml
parameters:
platform: ${{ BuildPlatform.name }}
Expand Down Expand Up @@ -226,17 +220,12 @@ stages:
- Agent.HasDevices -equals False
- Agent.IsPaired -equals False
steps:
- ${{ if eq(BuildPlatform.name, 'macOS') }}:
- template: agent-cleanser/v1.yml@xamarin-templates
parameters:
UninstallMono: false
UninstallXamarinMac: false
CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
- template: common/provision.yml
parameters:
platform: ${{ BuildPlatform.name }}
poolName: ${{ BuildPlatform.poolName }}
provisionatorChannel: ${{ parameters.provisionatorChannel }}

- task: DownloadBuildArtifacts@0
displayName: 'Download Packages'
inputs:
Expand Down Expand Up @@ -284,12 +273,6 @@ stages:
- Agent.HasDevices -equals False
- Agent.IsPaired -equals False
steps:
- ${{ if eq(BuildPlatform.name, 'macOS') }}:
- template: agent-cleanser/v1.yml@xamarin-templates
parameters:
UninstallMono: false
UninstallXamarinMac: false
CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
- template: common/provision.yml
parameters:
platform: ${{ BuildPlatform.name }}
Expand Down