Skip to content

Commit 376d523

Browse files
azure-sdkJimSuplizio
azure-sdk
and
JimSuplizio
authored
Sync eng/common directory with azure-sdk-tools for PR 8370 (Azure#40486)
* PAT Removal from pipeline generation yml * update version of PipelineGenerator to install --------- Co-authored-by: James Suplizio <[email protected]>
1 parent 83c2a2c commit 376d523

File tree

2 files changed

+164
-149
lines changed

2 files changed

+164
-149
lines changed

‎eng/common/pipelines/templates/jobs/prepare-pipelines.yml

Lines changed: 163 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -35,166 +35,181 @@ jobs:
3535
- template: /eng/common/pipelines/templates/steps/set-default-branch.yml
3636
# This covers our public repos.
3737
- ${{ if not(endsWith(parameters.Repository, '-pr'))}}:
38-
- script: >
39-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
40-
--organization azure-sdk
41-
--project public
42-
--prefix ${{parameters.Prefix}}
43-
--devopspath "\${{parameters.Prefix}}"
44-
--path $(System.DefaultWorkingDirectory)/sdk
45-
--endpoint Azure
46-
--repository ${{parameters.Repository}}
47-
--convention ci
48-
--agentpool Hosted
49-
--branch refs/heads/$(DefaultBranch)
50-
--patvar PATVAR
51-
--set-managed-variables
52-
--debug
53-
${{parameters.CIConventionOptions}}
38+
- task: AzureCLI@2
39+
inputs:
40+
azureSubscription: 'opensource-api-connection'
41+
scriptType: pscore
42+
scriptLocation: inlineScript
43+
inlineScript:
44+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
45+
--organization azure-sdk `
46+
--project public `
47+
--prefix ${{parameters.Prefix}} `
48+
--devopspath "\${{parameters.Prefix}}" `
49+
--path $(System.DefaultWorkingDirectory)/sdk `
50+
--endpoint Azure `
51+
--repository ${{parameters.Repository}} `
52+
--convention ci `
53+
--agentpool Hosted `
54+
--branch refs/heads/$(DefaultBranch) `
55+
--set-managed-variables `
56+
--debug `
57+
${{parameters.CIConventionOptions}}
5458
displayName: Create CI Pipelines for Public Repository
55-
env:
56-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
57-
- script: >
58-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
59-
--organization azure-sdk
60-
--project internal
61-
--prefix ${{parameters.Prefix}}
62-
--devopspath "\${{parameters.Prefix}}"
63-
--path $(System.DefaultWorkingDirectory)/sdk
64-
--endpoint Azure
65-
--repository ${{parameters.Repository}}
66-
--convention up
67-
--agentpool Hosted
68-
--branch refs/heads/$(DefaultBranch)
69-
--patvar PATVAR
70-
--set-managed-variables
71-
--debug
72-
${{parameters.UPConventionOptions}}
59+
- task: AzureCLI@2
60+
inputs:
61+
azureSubscription: 'opensource-api-connection'
62+
scriptType: pscore
63+
scriptLocation: inlineScript
64+
inlineScript:
65+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
66+
--organization azure-sdk `
67+
--project internal `
68+
--prefix ${{parameters.Prefix}} `
69+
--devopspath "\${{parameters.Prefix}}" `
70+
--path $(System.DefaultWorkingDirectory)/sdk `
71+
--endpoint Azure `
72+
--repository ${{parameters.Repository}} `
73+
--convention up `
74+
--agentpool Hosted `
75+
--branch refs/heads/$(DefaultBranch) `
76+
--set-managed-variables `
77+
--debug `
78+
${{parameters.UPConventionOptions}}
7379
displayName: Create UP Pipelines for Public Repository
74-
env:
75-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
76-
- script: >
77-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
78-
--organization azure-sdk
79-
--project internal
80-
--prefix ${{parameters.Prefix}}
81-
--devopspath "\${{parameters.Prefix}}"
82-
--path $(System.DefaultWorkingDirectory)/sdk
83-
--endpoint Azure
84-
--repository ${{parameters.Repository}}
85-
--convention tests
86-
--agentpool Hosted
87-
--branch refs/heads/$(DefaultBranch)
88-
--patvar PATVAR
89-
--set-managed-variables
90-
--debug
91-
${{parameters.TestsConventionOptions}}
80+
- task: AzureCLI@2
81+
inputs:
82+
azureSubscription: 'opensource-api-connection'
83+
scriptType: pscore
84+
scriptLocation: inlineScript
85+
inlineScript:
86+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
87+
--organization azure-sdk `
88+
--project internal `
89+
--prefix ${{parameters.Prefix}} `
90+
--devopspath "\${{parameters.Prefix}}" `
91+
--path $(System.DefaultWorkingDirectory)/sdk `
92+
--endpoint Azure `
93+
--repository ${{parameters.Repository}} `
94+
--convention tests `
95+
--agentpool Hosted `
96+
--branch refs/heads/$(DefaultBranch) `
97+
--set-managed-variables `
98+
--debug `
99+
${{parameters.TestsConventionOptions}}
92100
displayName: Create Live Test Pipelines for Public Repository
93101
condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
94-
env:
95-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
96-
- script: >
97-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
98-
--organization azure-sdk
99-
--project internal
100-
--prefix ${{parameters.Prefix}}
101-
--devopspath "\${{parameters.Prefix}}"
102-
--path $(System.DefaultWorkingDirectory)/sdk
103-
--endpoint Azure
104-
--repository ${{parameters.Repository}}
105-
--convention testsweekly
106-
--agentpool Hosted
107-
--branch refs/heads/$(DefaultBranch)
108-
--patvar PATVAR
109-
--set-managed-variables
110-
--debug
111-
${{parameters.TestsConventionOptions}}
102+
- task: AzureCLI@2
103+
inputs:
104+
azureSubscription: 'opensource-api-connection'
105+
scriptType: pscore
106+
scriptLocation: inlineScript
107+
inlineScript:
108+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
109+
--organization azure-sdk `
110+
--project internal `
111+
--prefix ${{parameters.Prefix}} `
112+
--devopspath "\${{parameters.Prefix}}" `
113+
--path $(System.DefaultWorkingDirectory)/sdk `
114+
--endpoint Azure `
115+
--repository ${{parameters.Repository}} `
116+
--convention testsweekly `
117+
--agentpool Hosted `
118+
--branch refs/heads/$(DefaultBranch) `
119+
--set-managed-variables `
120+
--debug `
121+
${{parameters.TestsConventionOptions}}
112122
displayName: Create Weekly (Multi-Cloud) Live Test Pipelines for Public Repository
113123
condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
114-
env:
115-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
116-
- script: >
117-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
118-
--organization azure-sdk
119-
--project internal
120-
--prefix ${{parameters.Prefix}}
121-
--devopspath "\${{parameters.Prefix}}"
122-
--path $(System.DefaultWorkingDirectory)/sdk
123-
--endpoint Azure
124-
--repository ${{parameters.Repository}}
125-
--convention upweekly
126-
--agentpool Hosted
127-
--branch refs/heads/$(DefaultBranch)
128-
--patvar PATVAR
129-
--set-managed-variables
130-
--debug
131-
${{parameters.UPConventionOptions}}
124+
- task: AzureCLI@2
125+
inputs:
126+
azureSubscription: 'opensource-api-connection'
127+
scriptType: pscore
128+
scriptLocation: inlineScript
129+
inlineScript:
130+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
131+
--organization azure-sdk `
132+
--project internal `
133+
--prefix ${{parameters.Prefix}} `
134+
--devopspath "\${{parameters.Prefix}}" `
135+
--path $(System.DefaultWorkingDirectory)/sdk `
136+
--endpoint Azure `
137+
--repository ${{parameters.Repository}} `
138+
--convention upweekly `
139+
--agentpool Hosted `
140+
--branch refs/heads/$(DefaultBranch) `
141+
--set-managed-variables `
142+
--debug `
143+
${{parameters.UPConventionOptions}}
132144
displayName: Create Weekly (Multi-Cloud) Unified Test Pipelines for Public Repository
133145
condition: and(succeeded(), eq(${{parameters.GenerateUnifiedWeekly}},true))
134-
env:
135-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
136-
137146

138147
# This covers our -pr repositories.
139148
- ${{ if endsWith(parameters.Repository, '-pr')}}:
140-
- script: >
141-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
142-
--organization azure-sdk
143-
--project internal
144-
--prefix ${{parameters.Prefix}}-pr
145-
--devopspath "\${{parameters.Prefix}}\pr"
146-
--path $(System.DefaultWorkingDirectory)/sdk
147-
--endpoint Azure
148-
--repository ${{parameters.Repository}}
149-
--convention ci
150-
--agentpool Hosted
151-
--branch refs/heads/$(DefaultBranch)
152-
--patvar PATVAR
153-
--set-managed-variables
154-
--debug
155-
--no-schedule
156-
${{parameters.CIConventionOptions}}
149+
- task: AzureCLI@2
150+
inputs:
151+
azureSubscription: 'opensource-api-connection'
152+
scriptType: pscore
153+
scriptLocation: inlineScript
154+
inlineScript:
155+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
156+
--organization azure-sdk `
157+
--project internal `
158+
--prefix ${{parameters.Prefix}}-pr `
159+
--devopspath "\${{parameters.Prefix}}\pr" `
160+
--path $(System.DefaultWorkingDirectory)/sdk `
161+
--endpoint Azure `
162+
--repository ${{parameters.Repository}} `
163+
--convention ci `
164+
--agentpool Hosted `
165+
--branch refs/heads/$(DefaultBranch) `
166+
--set-managed-variables `
167+
--debug `
168+
--no-schedule `
169+
${{parameters.CIConventionOptions}}
157170
displayName: Create CI Pipelines for Private Repository
158-
env:
159-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
160-
- script: >
161-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
162-
--organization azure-sdk
163-
--project internal
164-
--prefix ${{parameters.Prefix}}-pr
165-
--devopspath "\${{parameters.Prefix}}\pr"
166-
--path $(System.DefaultWorkingDirectory)/sdk
167-
--endpoint Azure
168-
--repository ${{parameters.Repository}}
169-
--convention up
170-
--agentpool Hosted
171-
--branch refs/heads/$(DefaultBranch)
172-
--patvar PATVAR
173-
--set-managed-variables
174-
--debug
175-
--no-schedule
176-
${{parameters.UPConventionOptions}}
171+
- task: AzureCLI@2
172+
inputs:
173+
azureSubscription: 'opensource-api-connection'
174+
scriptType: pscore
175+
scriptLocation: inlineScript
176+
inlineScript:
177+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
178+
--organization azure-sdk `
179+
--project internal `
180+
--prefix ${{parameters.Prefix}}-pr `
181+
--devopspath "\${{parameters.Prefix}}\pr" `
182+
--path $(System.DefaultWorkingDirectory)/sdk `
183+
--endpoint Azure `
184+
--repository ${{parameters.Repository}} `
185+
--convention up `
186+
--agentpool Hosted `
187+
--branch refs/heads/$(DefaultBranch) `
188+
--set-managed-variables `
189+
--debug `
190+
--no-schedule `
191+
${{parameters.UPConventionOptions}}
177192
displayName: Create UP Pipelines for Private Repository
178-
env:
179-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
180-
- script: >
181-
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
182-
--organization azure-sdk
183-
--project internal
184-
--prefix ${{parameters.Prefix}}-pr
185-
--devopspath "\${{parameters.Prefix}}\pr"
186-
--path $(System.DefaultWorkingDirectory)/sdk
187-
--endpoint Azure
188-
--repository ${{parameters.Repository}}
189-
--convention tests
190-
--agentpool Hosted
191-
--branch refs/heads/$(DefaultBranch)
192-
--patvar PATVAR
193-
--set-managed-variables
194-
--debug
195-
--no-schedule
196-
${{parameters.TestsConventionOptions}}
193+
- task: AzureCLI@2
194+
inputs:
195+
azureSubscription: 'opensource-api-connection'
196+
scriptType: pscore
197+
scriptLocation: inlineScript
198+
inlineScript:
199+
$(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate `
200+
--organization azure-sdk `
201+
--project internal `
202+
--prefix ${{parameters.Prefix}}-pr `
203+
--devopspath "\${{parameters.Prefix}}\pr" `
204+
--path $(System.DefaultWorkingDirectory)/sdk `
205+
--endpoint Azure `
206+
--repository ${{parameters.Repository}} `
207+
--convention tests `
208+
--agentpool Hosted `
209+
--branch refs/heads/$(DefaultBranch) `
210+
--set-managed-variables `
211+
--debug `
212+
--no-schedule `
213+
${{parameters.TestsConventionOptions}}
197214
displayName: Create Live Test Pipelines for Private Repository
198215
condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
199-
env:
200-
PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)

‎eng/common/pipelines/templates/steps/install-pipeline-generation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ steps:
99
- script: >
1010
dotnet tool install
1111
Azure.Sdk.Tools.PipelineGenerator
12-
--version 1.1.0-dev.20221220.1
12+
--version 1.1.0-dev.20240604.1
1313
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
1414
--tool-path ${{parameters.ToolPath}}
1515
workingDirectory: $(Pipeline.Workspace)/pipeline-generator

0 commit comments

Comments
 (0)