Skip to content

Commit 6f0da99

Browse files
scbeddweshaggard
scbedd
and
weshaggard
authored
Simplify build yml (#36567)
* make advanced build the default build template choice in preparation for pipelinev3 * only build windows and mac packages if necessary, as indicated by a service directory of "storage" * remove job coalesce as unnecessary --------- Co-authored-by: Wes Haggard <[email protected]>
1 parent c100927 commit 6f0da99

14 files changed

+163
-190
lines changed

‎eng/pipelines/templates/jobs/ci.tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,7 @@ jobs:
122122
InjectedPackages: $(InjectedPackages)
123123
TestProxy: ${{ parameters.TestProxy }}
124124
BeforeTestSteps:
125-
- task: DownloadPipelineArtifact@2
126-
inputs:
127-
artifactName: 'packages'
128-
targetPath: $(Build.ArtifactStagingDirectory)
125+
- template: /eng/pipelines/templates/steps/download-package-artifacts.yml
129126

130127
- template: ../steps/set-dev-build.yml
131128
parameters:

‎eng/pipelines/templates/jobs/ci.yml

Lines changed: 56 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -61,141 +61,68 @@ parameters:
6161
- name: GenerateApiReviewForManualOnly
6262
type: boolean
6363
default: false
64-
- name: AdvancedBuild
65-
type: boolean
66-
default: false
6764

6865
jobs:
66+
- job: 'Build_Linux'
67+
timeoutInMinutes: 90
6968

70-
- ${{ if eq(parameters['AdvancedBuild'], false) }}:
71-
- job: 'Build'
72-
timeoutInMinutes: 90
73-
74-
pool:
75-
name: $(LINUXPOOL)
76-
image: $(LINUXVMIMAGE)
77-
os: linux
78-
79-
steps:
80-
- template: /eng/pipelines/templates/steps/targeting-string-resolve.yml
81-
parameters:
82-
BuildTargetingString: ${{ parameters.BuildTargetingString }}
83-
84-
- template: ../steps/build-package-artifacts.yml
85-
parameters:
86-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
87-
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
88-
TestPipeline: ${{ parameters.TestPipeline }}
89-
Artifacts: ${{ parameters.Artifacts }}
90-
91-
- ${{ if eq(parameters['AdvancedBuild'], true) }}:
92-
- job: 'Build_Linux'
93-
timeoutInMinutes: 90
94-
95-
pool:
96-
name: $(LINUXPOOL)
97-
image: $(LINUXVMIMAGE)
98-
os: linux
99-
100-
steps:
101-
- template: /eng/pipelines/templates/steps/targeting-string-resolve.yml
102-
parameters:
103-
BuildTargetingString: ${{ parameters.BuildTargetingString }}
104-
105-
- template: ../steps/build-package-artifacts.yml
106-
parameters:
107-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
108-
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
109-
TestPipeline: ${{ parameters.TestPipeline }}
110-
Artifacts: ${{ parameters.Artifacts }}
111-
ArtifactSuffix: linux
112-
UseVirtualEnvironment: false
113-
114-
- job: 'Build_Windows'
115-
timeoutInMinutes: 90
116-
117-
pool:
118-
name: $(WINDOWSPOOL)
119-
image: $(WINDOWSVMIMAGE)
120-
os: windows
121-
122-
steps:
123-
- template: /eng/pipelines/templates/steps/targeting-string-resolve.yml
124-
parameters:
125-
BuildTargetingString: ${{ parameters.BuildTargetingString }}
126-
127-
- template: ../steps/build-package-artifacts.yml
128-
parameters:
129-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
130-
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
131-
TestPipeline: ${{ parameters.TestPipeline }}
132-
Artifacts: ${{ parameters.Artifacts }}
133-
ArtifactSuffix: windows
134-
UseVirtualEnvironment: false
135-
136-
- job: 'Build_MacOS'
137-
timeoutInMinutes: 90
138-
139-
pool:
140-
name: $(MACPOOL)
141-
vmImage: $(MACVMIMAGE)
142-
os: macOS
143-
144-
steps:
145-
- template: /eng/pipelines/templates/steps/targeting-string-resolve.yml
146-
parameters:
147-
BuildTargetingString: ${{ parameters.BuildTargetingString }}
69+
pool:
70+
name: $(LINUXPOOL)
71+
image: $(LINUXVMIMAGE)
72+
os: linux
14873

149-
- template: ../steps/build-package-artifacts.yml
150-
parameters:
151-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
152-
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
153-
TestPipeline: ${{ parameters.TestPipeline }}
154-
Artifacts: ${{ parameters.Artifacts }}
155-
ArtifactSuffix: mac
156-
UseVirtualEnvironment: false
74+
steps:
75+
- template: /eng/pipelines/templates/steps/build.yml
76+
parameters:
77+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
78+
BuildTargetingString: ${{ parameters.BuildTargetingString }}
79+
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
80+
TestPipeline: ${{ parameters.TestPipeline }}
81+
ArtifactSuffix: linux
82+
Artifacts: ${{ parameters.Artifacts }}
15783

158-
- job: 'CoalesceBuildArtifacts'
159-
displayName: Combine Built Artifacts
160-
dependsOn:
161-
- 'Build_Linux'
162-
- 'Build_Windows'
163-
- 'Build_MacOS'
164-
timeoutInMinutes: 90
84+
- job: 'Build_Windows'
85+
timeoutInMinutes: 90
16586

166-
pool:
167-
name: $(LINUXPOOL)
168-
image: $(LINUXVMIMAGE)
169-
os: linux
87+
pool:
88+
name: $(WINDOWSPOOL)
89+
image: $(WINDOWSVMIMAGE)
90+
os: windows
17091

171-
steps:
172-
- task: DownloadPipelineArtifact@2
173-
inputs:
174-
artifactName: 'packages_windows'
175-
targetPath: $(Build.ArtifactStagingDirectory)/packages
92+
steps:
93+
- template: /eng/pipelines/templates/steps/build.yml
94+
parameters:
95+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
96+
BuildTargetingString: ${{ parameters.BuildTargetingString }}
97+
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
98+
TestPipeline: ${{ parameters.TestPipeline }}
99+
ArtifactSuffix: windows
100+
Artifacts: ${{ parameters.Artifacts }}
176101

177-
- task: DownloadPipelineArtifact@2
178-
inputs:
179-
artifactName: 'packages_mac'
180-
targetPath: $(Build.ArtifactStagingDirectory)/packages
102+
- job: 'Build_MacOS'
103+
timeoutInMinutes: 90
181104

182-
- task: DownloadPipelineArtifact@2
183-
inputs:
184-
artifactName: 'packages_linux'
185-
targetPath: $(Build.ArtifactStagingDirectory)/packages
105+
pool:
106+
name: $(MACPOOL)
107+
vmImage: $(MACVMIMAGE)
108+
os: macOS
186109

187-
- template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
188-
parameters:
189-
ArtifactPath: '$(Build.ArtifactStagingDirectory)/packages'
190-
ArtifactName: 'packages'
110+
steps:
111+
- template: /eng/pipelines/templates/steps/build.yml
112+
parameters:
113+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
114+
BuildTargetingString: ${{ parameters.BuildTargetingString }}
115+
BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
116+
TestPipeline: ${{ parameters.TestPipeline }}
117+
ArtifactSuffix: mac
118+
Artifacts: ${{ parameters.Artifacts }}
191119

192120
- job: 'Build_Extended'
193121
displayName: Build Extended
194122
dependsOn:
195-
- ${{ if eq(parameters['AdvancedBuild'], true) }}:
196-
- 'CoalesceBuildArtifacts'
197-
- ${{ else }}:
198-
- 'Build'
123+
- 'Build_Linux'
124+
- 'Build_Windows'
125+
- 'Build_MacOS'
199126

200127
timeoutInMinutes: 90
201128

@@ -205,6 +132,8 @@ jobs:
205132
os: linux
206133

207134
steps:
135+
- template: /eng/pipelines/templates/steps/download-package-artifacts.yml
136+
208137
- template: /eng/pipelines/templates/steps/targeting-string-resolve.yml
209138
parameters:
210139
BuildTargetingString: ${{ parameters.BuildTargetingString }}
@@ -272,10 +201,9 @@ jobs:
272201
OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt
273202
Pool: azsdk-pool-mms-ubuntu-2004-general
274203
DependsOn:
275-
- ${{ if eq(parameters['AdvancedBuild'], true) }}:
276-
- 'CoalesceBuildArtifacts'
277-
- ${{ else }}:
278-
- 'Build'
204+
- 'Build_Linux'
205+
- 'Build_Windows'
206+
- 'Build_MacOS'
279207
MatrixConfigs: ${{ parameters.MatrixConfigs }}
280208
MatrixFilters: ${{ parameters.MatrixFilters }}
281209
MatrixReplace: ${{ parameters.MatrixReplace }}
@@ -327,10 +255,9 @@ jobs:
327255
CloudConfig:
328256
Cloud: Public
329257
DependsOn:
330-
- ${{ if eq(parameters['AdvancedBuild'], true) }}:
331-
- 'CoalesceBuildArtifacts'
332-
- ${{ else }}:
333-
- 'Build'
258+
- 'Build_Linux'
259+
- 'Build_Windows'
260+
- 'Build_MacOS'
334261
AdditionalParameters:
335262
BuildTargetingString: ${{ parameters.BuildTargetingString }}
336263
ServiceDirectory: ${{ parameters.ServiceDirectory }}

‎eng/pipelines/templates/jobs/regression.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,10 @@ jobs:
7979
displayName: 'Use Python 3.9'
8080
inputs:
8181
versionSpec: '3.9'
82-
82+
8383
- template: /eng/pipelines/templates/steps/use-venv.yml
8484

85-
- task: DownloadPipelineArtifact@2
86-
inputs:
87-
artifactName: 'packages'
88-
targetPath: $(Build.ArtifactStagingDirectory)
85+
- template: /eng/pipelines/templates/steps/download-package-artifacts.yml
8986

9087
- pwsh: |
9188
mkdir -p $(TEST_PROXY_FOLDER)

‎eng/pipelines/templates/stages/archetype-python-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ stages:
106106
deploy:
107107
steps:
108108
- checkout: self
109+
109110
- download: current
110111
artifact: ${{parameters.ArtifactName}}
111112
timeoutInMinutes: 5
@@ -294,7 +295,6 @@ stages:
294295
name: azsdk-pool-mms-ubuntu-2004-general
295296
os: linux
296297
steps:
297-
- checkout: none
298298
- download: current
299299
artifact: ${{parameters.ArtifactName}}
300300
timeoutInMinutes: 5

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ parameters:
7272
- name: GenerateApiReviewForManualOnly
7373
type: boolean
7474
default: false
75-
- name: AdvancedBuild
76-
type: boolean
77-
default: false
7875
- name: oneESTemplateTag
7976
type: string
8077
default: release
@@ -113,7 +110,6 @@ extends:
113110
ValidateFormatting: ${{ parameters.ValidateFormatting }}
114111
TestProxy: ${{ parameters.TestProxy }}
115112
GenerateApiReviewForManualOnly: ${{ parameters.GenerateApiReviewForManualOnly }}
116-
AdvancedBuild: ${{ parameters.AdvancedBuild }}
117113

118114
variables:
119115
- template: /eng/pipelines/templates/variables/globals.yml

‎eng/pipelines/templates/steps/build-extended-artifacts.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ parameters:
2424

2525
# Please use `$(TargetingString)` to refer to the python packages glob string. This was previously `${{ parameters.BuildTargetingString }}`.
2626
steps:
27-
- task: DownloadPipelineArtifact@2
28-
inputs:
29-
artifactName: 'packages'
30-
targetPath: $(Build.ArtifactStagingDirectory)
31-
3227
- task: UsePythonVersion@0
3328
displayName: 'Use Python 3.11'
3429
inputs:

0 commit comments

Comments
 (0)