diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 6eabb569d85c..4a14603505b7 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -1,9 +1,35 @@ +parameters: +- name: Artifacts + type: object + default: [] +- name: TestPipeline + type: boolean + default: false +- name: ArtifactName + type: string + default: packages +- name: ServiceDirectory + type: string + default: not-specified +- name: ServiceToTest + type: string + default: '' +- name: TestSetupSteps + type: stepList + default: [] +- name: WindowsPool + type: string + default: azsdk-pool-mms-win-2019-general +- name: LinuxPool + type: string + default: azsdk-pool-mms-ubuntu-1804-general + jobs: - job: Build variables: - template: ../variables/globals.yml pool: - name: azsdk-pool-mms-win-2019-general # Comment this line back-out to switch to public pools. + name: ${{ parameters.WindowsPool }} # Comment this line back-out to switch to public pools. # vmImage: windows-2019 # Comment this line back-in to switch to public pools. steps: - ${{if eq(parameters.TestPipeline, 'true')}}: @@ -69,7 +95,8 @@ jobs: variables: - template: ../variables/globals.yml pool: - vmImage: ubuntu-18.04 + name: ${{ parameters.LinuxPool }} + vmImage: steps: - task: UsePythonVersion@0 displayName: "Use Python 3.6" @@ -124,25 +151,25 @@ jobs: maxParallel: $[ variables['MaxParallelTestJobs'] ] matrix: Linux: - Pool: # Intentionally blank. - OSVmImage: "ubuntu-18.04" + Pool: ${{ parameters.LinuxPool }} # Comment out to swap back to public hosted pool. + OSVmImage: # "ubuntu-18.04" # Comment back in to swap back to public hosted pool. TestTargetFramework: netcoreapp2.1 Windows_NetCoreApp: - Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool. + Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool. OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool. TestTargetFramework: netcoreapp2.1 CollectCoverage: true Windows_NetCoreApp_ProjectReferences: - Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool. + Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool. OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool. TestTargetFramework: netcoreapp2.1 ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true Windows_NetFramework: - Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool. + Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool. OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool. TestTargetFramework: net461 Windows_NetFramework_ProjectReferences: - Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool. + Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool. OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool. TestTargetFramework: net461 ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true @@ -151,7 +178,7 @@ jobs: OSVmImage: "macOS-10.15" TestTargetFramework: netcoreapp2.1 Windows_Net50: - Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool. + Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool. OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool. TestTargetFramework: net5.0 pool: diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 28831b52b400..4e54a0cd4872 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -33,6 +33,12 @@ parameters: - name: TestSetupSteps type: stepList default: [] +- name: WindowsPool + type: string + default: azsdk-pool-mms-win-2019-general +- name: LinuxPool + type: string + default: azsdk-pool-mms-ubuntu-1804-general stages: - stage: Build @@ -46,6 +52,8 @@ stages: TestPipeline: ${{ parameters.TestPipeline }} ArtifactName: packages TestSetupSteps: ${{ parameters.TestSetupSteps }} + WindowsPool: ${{ parameters.WindowsPool }} + LinuxPool: ${{ parameters.LinuxPool }} # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch. - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}: diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 662c7417e6a1..2e18a28764ee 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -25,6 +25,8 @@ extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: ServiceDirectory: storage + LinuxPool: azsdk-pool-mms-ubuntu-1804-general + WindowsPool: azsdk-pool-mms-win-2019-general ArtifactName: packages Artifacts: - name: Azure.Storage.Blobs