Skip to content

Commit bf8d07f

Browse files
authored
Use vmImage variable (#70)
* Use vmImage variable
1 parent ecf1cd0 commit bf8d07f

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

scripts/azure-devops/azure-pipelines.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
displayName: 'Non-modifying tests'
6565

6666
pool:
67-
name: 'Azure Pipelines'
68-
vmImage: ubuntu-latest
67+
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
68+
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
6969

7070
steps:
7171
- task: AzureCLI@2
@@ -155,8 +155,8 @@ jobs:
155155
- job: createServiceConnection
156156
displayName: 'Create Service Connection'
157157
pool:
158-
name: 'Azure Pipelines'
159-
vmImage: ubuntu-latest
158+
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
159+
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
160160

161161
steps:
162162
- task: AzureCLI@2
@@ -227,8 +227,8 @@ jobs:
227227
dependsOn: createServiceConnection
228228
displayName: 'Test created Service Connection'
229229
pool:
230-
name: 'Azure Pipelines'
231-
vmImage: ubuntu-latest
230+
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
231+
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
232232

233233
steps:
234234
- task: AzureCLI@2
@@ -250,12 +250,12 @@ jobs:
250250
strategy:
251251
matrix:
252252
linux:
253-
pool: ubuntu-latest
253+
vmImage: ubuntu-latest
254254
windows:
255-
pool: windows-latest
255+
vmImage: windows-latest
256256
pool:
257-
name: 'Azure Pipelines'
258-
vmImage: $(pool)
257+
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
258+
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
259259

260260
steps:
261261
- task: AzureCLI@2
@@ -343,8 +343,8 @@ jobs:
343343
# - testConvertedServiceConnection
344344
- testCreatedServiceConnection
345345
pool:
346-
name: 'Azure Pipelines'
347-
vmImage: ubuntu-latest
346+
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
347+
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
348348
variables:
349349
# TODO: Take outputs of multiple jobs dependencies.convertServiceConnection.outputs['job2.convert.serviceConnectionId']
350350
# convertedServiceConnectionId1: $[ dependencies.convertServiceConnection.outputs['job1.convert.serviceConnectionId'] ]

scripts/azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
- job: find_workload_identity
3737

3838
pool:
39-
name: 'Azure Pipelines'
40-
vmImage: ubuntu-latest
39+
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
40+
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
4141

4242
steps:
4343
- task: AzureCLI@2
@@ -76,8 +76,8 @@ jobs:
7676
- job: list_managed_identities
7777

7878
pool:
79-
name: 'Azure Pipelines'
80-
vmImage: ubuntu-latest
79+
name: $[ coalesce(variables.pool,'Azure Pipelines') ]
80+
vmImage: $[ coalesce(variables.vmImage,'ubuntu-latest') ]
8181

8282
steps:
8383
- task: AzureCLI@2

0 commit comments

Comments
 (0)