Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions scripts/azure-devops/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ jobs:
displayName: 'Non-modifying tests'

pool:
name: 'Azure Pipelines'
vmImage: ubuntu-latest
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]

steps:
- task: AzureCLI@2
Expand Down Expand Up @@ -155,8 +155,8 @@ jobs:
- job: createServiceConnection
displayName: 'Create Service Connection'
pool:
name: 'Azure Pipelines'
vmImage: ubuntu-latest
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]

steps:
- task: AzureCLI@2
Expand Down Expand Up @@ -227,8 +227,8 @@ jobs:
dependsOn: createServiceConnection
displayName: 'Test created Service Connection'
pool:
name: 'Azure Pipelines'
vmImage: ubuntu-latest
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]

steps:
- task: AzureCLI@2
Expand All @@ -250,12 +250,12 @@ jobs:
strategy:
matrix:
linux:
pool: ubuntu-latest
vmImage: ubuntu-latest
windows:
pool: windows-latest
vmImage: windows-latest
pool:
name: 'Azure Pipelines'
vmImage: $(pool)
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]

steps:
- task: AzureCLI@2
Expand Down Expand Up @@ -343,8 +343,8 @@ jobs:
# - testConvertedServiceConnection
- testCreatedServiceConnection
pool:
name: 'Azure Pipelines'
vmImage: ubuntu-latest
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
variables:
# TODO: Take outputs of multiple jobs dependencies.convertServiceConnection.outputs['job2.convert.serviceConnectionId']
# convertedServiceConnectionId1: $[ dependencies.convertServiceConnection.outputs['job1.convert.serviceConnectionId'] ]
Expand Down
8 changes: 4 additions & 4 deletions scripts/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
- job: find_workload_identity

pool:
name: 'Azure Pipelines'
vmImage: ubuntu-latest
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]

steps:
- task: AzureCLI@2
Expand Down Expand Up @@ -76,8 +76,8 @@ jobs:
- job: list_managed_identities

pool:
name: 'Azure Pipelines'
vmImage: ubuntu-latest
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]

steps:
- task: AzureCLI@2
Expand Down