Fixed pipeline jobs to respect AGENT_POOL (#291)

* add agent `pool` attributes to all `job` defs

* point the `release/provision` jobs at an `agent pool` not a `vmImage`

* move the `pool` def up, alike the build-stage
(and help keep it at the right indentation level)
This commit is contained in:
Stephen Henderson 2019-09-12 10:20:25 -05:00 коммит произвёл GitHub
Родитель 7b24375de5
Коммит 0f806b062f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -10,7 +10,9 @@ jobs:
variables: variables:
- group: '${{ parameters.environment }} Environment Variables' - group: '${{ parameters.environment }} Environment Variables'
displayName: Determine CI Targets to Run displayName: Determine CI Targets to Run
pool: $(AGENT_POOL)
condition: not(coalesce(variables.FORCE_RUN, ${{ parameters.forceRun }})) condition: not(coalesce(variables.FORCE_RUN, ${{ parameters.forceRun }}))
steps: steps:
- ${{ each config in parameters.configurationMatrix }}: - ${{ each config in parameters.configurationMatrix }}:
- task: Bash@3 - task: Bash@3

Просмотреть файл

@ -7,6 +7,7 @@ parameters:
jobs: jobs:
- job: TemplateChangeDetection - job: TemplateChangeDetection
pool: $(AGENT_POOL)
variables: variables:
- group: '${{ parameters.environment }} Environment Variables' - group: '${{ parameters.environment }} Environment Variables'
displayName: Determine CD Targets to Run displayName: Determine CD Targets to Run
@ -25,14 +26,12 @@ jobs:
- ${{ each config in parameters.configurationMatrix }}: - ${{ each config in parameters.configurationMatrix }}:
- deployment: Provision_${{ config.jobName }}_${{ parameters.environment }} - deployment: Provision_${{ config.jobName }}_${{ parameters.environment }}
dependsOn: TemplateChangeDetection dependsOn: TemplateChangeDetection
pool: $(AGENT_POOL)
condition: or(coalesce(variables.FORCE_RUN, ${{ parameters.forceRun }}), eq(dependencies.TemplateChangeDetection.outputs['${{ config.jobName }}.needs_cicd'], 'true')) condition: or(coalesce(variables.FORCE_RUN, ${{ parameters.forceRun }}), eq(dependencies.TemplateChangeDetection.outputs['${{ config.jobName }}.needs_cicd'], 'true'))
${{ if config.deploymentTimeoutInMinutes }}: ${{ if config.deploymentTimeoutInMinutes }}:
timeoutInMinutes: '${{ config.deploymentTimeoutInMinutes }}' timeoutInMinutes: '${{ config.deploymentTimeoutInMinutes }}'
pool:
vmImage: $(AGENT_POOL)
variables: variables:
- group: '${{ parameters.environment }} Environment Variables' - group: '${{ parameters.environment }} Environment Variables'

Просмотреть файл

@ -9,4 +9,3 @@ provider "null" {
provider "azuread" { provider "azuread" {
version = "~>0.4.0" version = "~>0.4.0"
} }