diff --git a/scripts/azure-devops/azure-pipelines.yml b/scripts/azure-devops/azure-pipelines.yml index 20d2655..bccc105 100644 --- a/scripts/azure-devops/azure-pipelines.yml +++ b/scripts/azure-devops/azure-pipelines.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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'] ] diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 05f1ba8..f3b1328 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -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 @@ -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