Skip to content

Commit d47236e

Browse files
authored
Add config for 1ES hosted Linux pool. (Azure#17472)
* Add config for 1ES hosted Linux pool.
1 parent eb5cb0c commit d47236e

File tree

3 files changed

+46
-9
lines changed

3 files changed

+46
-9
lines changed

eng/pipelines/templates/jobs/archetype-sdk-client.yml

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
1+
parameters:
2+
- name: Artifacts
3+
type: object
4+
default: []
5+
- name: TestPipeline
6+
type: boolean
7+
default: false
8+
- name: ArtifactName
9+
type: string
10+
default: packages
11+
- name: ServiceDirectory
12+
type: string
13+
default: not-specified
14+
- name: ServiceToTest
15+
type: string
16+
default: ''
17+
- name: TestSetupSteps
18+
type: stepList
19+
default: []
20+
- name: WindowsPool
21+
type: string
22+
default: azsdk-pool-mms-win-2019-general
23+
- name: LinuxPool
24+
type: string
25+
default: azsdk-pool-mms-ubuntu-1804-general
26+
127
jobs:
228
- job: Build
329
variables:
430
- template: ../variables/globals.yml
531
pool:
6-
name: azsdk-pool-mms-win-2019-general # Comment this line back-out to switch to public pools.
32+
name: ${{ parameters.WindowsPool }} # Comment this line back-out to switch to public pools.
733
# vmImage: windows-2019 # Comment this line back-in to switch to public pools.
834
steps:
935
- ${{if eq(parameters.TestPipeline, 'true')}}:
@@ -69,7 +95,8 @@ jobs:
6995
variables:
7096
- template: ../variables/globals.yml
7197
pool:
72-
vmImage: ubuntu-18.04
98+
name: ${{ parameters.LinuxPool }}
99+
vmImage:
73100
steps:
74101
- task: UsePythonVersion@0
75102
displayName: "Use Python 3.6"
@@ -124,25 +151,25 @@ jobs:
124151
maxParallel: $[ variables['MaxParallelTestJobs'] ]
125152
matrix:
126153
Linux:
127-
Pool: # Intentionally blank.
128-
OSVmImage: "ubuntu-18.04"
154+
Pool: ${{ parameters.LinuxPool }} # Comment out to swap back to public hosted pool.
155+
OSVmImage: # "ubuntu-18.04" # Comment back in to swap back to public hosted pool.
129156
TestTargetFramework: netcoreapp2.1
130157
Windows_NetCoreApp:
131-
Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool.
158+
Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool.
132159
OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool.
133160
TestTargetFramework: netcoreapp2.1
134161
CollectCoverage: true
135162
Windows_NetCoreApp_ProjectReferences:
136-
Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool.
163+
Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool.
137164
OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool.
138165
TestTargetFramework: netcoreapp2.1
139166
ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true
140167
Windows_NetFramework:
141-
Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool.
168+
Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool.
142169
OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool.
143170
TestTargetFramework: net461
144171
Windows_NetFramework_ProjectReferences:
145-
Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool.
172+
Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool.
146173
OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool.
147174
TestTargetFramework: net461
148175
ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true
@@ -151,7 +178,7 @@ jobs:
151178
OSVmImage: "macOS-10.15"
152179
TestTargetFramework: netcoreapp2.1
153180
Windows_Net50:
154-
Pool: azsdk-pool-mms-win-2019-general # Comment out to swap back to public hosted pool.
181+
Pool: ${{ parameters.WindowsPool }} # Comment out to swap back to public hosted pool.
155182
OSVmImage: # "windows-2019" # Comment back in to swap back to public hosted pool.
156183
TestTargetFramework: net5.0
157184
pool:

eng/pipelines/templates/stages/archetype-sdk-client.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ parameters:
3333
- name: TestSetupSteps
3434
type: stepList
3535
default: []
36+
- name: WindowsPool
37+
type: string
38+
default: azsdk-pool-mms-win-2019-general
39+
- name: LinuxPool
40+
type: string
41+
default: azsdk-pool-mms-ubuntu-1804-general
3642

3743
stages:
3844
- stage: Build
@@ -46,6 +52,8 @@ stages:
4652
TestPipeline: ${{ parameters.TestPipeline }}
4753
ArtifactName: packages
4854
TestSetupSteps: ${{ parameters.TestSetupSteps }}
55+
WindowsPool: ${{ parameters.WindowsPool }}
56+
LinuxPool: ${{ parameters.LinuxPool }}
4957

5058
# The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
5159
- ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:

sdk/storage/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ extends:
2525
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
2626
parameters:
2727
ServiceDirectory: storage
28+
LinuxPool: azsdk-pool-mms-ubuntu-1804-general
29+
WindowsPool: azsdk-pool-mms-win-2019-general
2830
ArtifactName: packages
2931
Artifacts:
3032
- name: Azure.Storage.Blobs

0 commit comments

Comments
 (0)