From 4c41f23ec4a82a6ed3d34ee72e9b9afde833508e Mon Sep 17 00:00:00 2001 From: Matt Cooley Date: Tue, 5 Mar 2019 07:06:06 -0800 Subject: [PATCH] Switch CI builds to use public machine pool (#93) --- build/pipelines/azure-pipelines.ci.yaml | 6 ++++++ build/pipelines/azure-pipelines.release.yaml | 6 ++++++ build/pipelines/templates/run-unit-tests.yaml | 7 +++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/build/pipelines/azure-pipelines.ci.yaml b/build/pipelines/azure-pipelines.ci.yaml index 3c04384..31ce98f 100644 --- a/build/pipelines/azure-pipelines.ci.yaml +++ b/build/pipelines/azure-pipelines.ci.yaml @@ -36,9 +36,15 @@ jobs: - template: ./templates/run-unit-tests.yaml parameters: platform: x64 + reimageServiceConnection: essential-experiences-interactive-reimage + reimageSubscriptionId: a8f5eb47-e59c-44b4-8e42-e70811a047b5 + reimageResourceGroup: EETestPublic - template: ./templates/run-unit-tests.yaml parameters: platform: x86 + reimageServiceConnection: essential-experiences-interactive-reimage + reimageSubscriptionId: a8f5eb47-e59c-44b4-8e42-e70811a047b5 + reimageResourceGroup: EETestPublic - template: ./templates/package-appxbundle.yaml diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml index 59cd41c..78b4fd9 100644 --- a/build/pipelines/azure-pipelines.release.yaml +++ b/build/pipelines/azure-pipelines.release.yaml @@ -38,10 +38,16 @@ jobs: - template: ./templates/run-unit-tests.yaml parameters: platform: x64 + reimageServiceConnection: macool-sandbox-interactiveDesktopRS5 + reimageSubscriptionId: 012a8008-c00f-45b3-9828-41ebba30141d + reimageResourceGroup: interactiveDesktopRS5 - template: ./templates/run-unit-tests.yaml parameters: platform: x86 + reimageServiceConnection: macool-sandbox-interactiveDesktopRS5 + reimageSubscriptionId: 012a8008-c00f-45b3-9828-41ebba30141d + reimageResourceGroup: interactiveDesktopRS5 - template: ./templates/package-appxbundle.yaml diff --git a/build/pipelines/templates/run-unit-tests.yaml b/build/pipelines/templates/run-unit-tests.yaml index 708b30b..6123609 100644 --- a/build/pipelines/templates/run-unit-tests.yaml +++ b/build/pipelines/templates/run-unit-tests.yaml @@ -2,6 +2,9 @@ parameters: platform: '' + reimageServiceConnection: '' + reimageSubscriptionId: '' + reimageResourceGroup: '' jobs: - job: UnitTests${{ parameters.platform }} @@ -49,6 +52,6 @@ jobs: displayName: Reimage test machine inputs: connectionType: connectedServiceNameARM - azureServiceConnection: macool-sandbox-interactiveDesktopRS5 - urlSuffix: subscriptions/012a8008-c00f-45b3-9828-41ebba30141d/resourceGroups/interactiveDesktopRS5/providers/Microsoft.Compute/virtualMachineScaleSets/essential/reimage?api-version=2018-10-01 + azureServiceConnection: ${{ parameters.reimageServiceConnection }} + urlSuffix: subscriptions/${{ parameters.reimageSubscriptionId }}/resourceGroups/${{ parameters.reimageResourceGroup }}/providers/Microsoft.Compute/virtualMachineScaleSets/essential/reimage?api-version=2018-10-01 body: '{ "instanceIds": ["$(agentInstanceId)"] }' \ No newline at end of file