Skip to content

Commit 002eea0

Browse files
Sync eng/common directory with azure-sdk-tools for PR 9466 (#38785)
* Use new generation tool that supports service connections * Fix condition for generating weekly test pipelines --------- Co-authored-by: Wes Haggard <[email protected]> Co-authored-by: Wes Haggard <[email protected]>
1 parent b296eab commit 002eea0

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ jobs:
2222
Prefix: 'na'
2323
DevOpsPath: 'na'
2424
InternalVariableGroups: ''
25+
InternalServiceConnections: ''
26+
GeneratePublicCIPipeline: ''
2527
GenerateUnifiedWeekly: ''
2628
TestVariableGroups: ''
29+
TestServiceConnections: ''
2730

2831
# Standard set of variable groups for the Azure SDK repositories
2932
AzureSDK_Maven_Release_Pipeline_Secrets: 1
@@ -70,6 +73,12 @@ jobs:
7073
exit 1
7174
}
7275
76+
$generatePublicCIPipeline = 'true'
77+
$generateUnifiedWeekly = 'false'
78+
79+
$testServiceConnections = '"Azure" "azure-sdk-tests" "azure-sdk-tests-china" "azure-sdk-tests-preview" "azure-sdk-tests-public" "azure-sdk-tests-usgov" "Azure SDK Test Resources - LiveTestSecrets"'
80+
$internalServiceConnections = '"Azure" "Azure SDK Artifacts" "Azure SDK Engineering System" "opensource-api-connection" "AzureSDKEngKeyVault Secrets"'
81+
7382
# Map the language prefix to the appropriate variable groups
7483
switch ($prefix)
7584
{
@@ -81,16 +90,19 @@ jobs:
8190
$internalVariableGroups = '$(AzureSDK_Maven_Release_Pipeline_Secrets) $(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
8291
}
8392
"js" {
93+
$generatePublicCIPipeline = 'false'
8494
$internalVariableGroups = '$(NPM_Registry_Authentication) $(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
8595
$testVariableGroups = '$(Secrets_for_Resource_Provisioner)'
8696
}
8797
"python" {
98+
$generatePublicCIPipeline = 'false'
8899
$internalVariableGroups = '$(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
89100
$testVariableGroups = '$(Secrets_for_Resource_Provisioner)'
90101
}
91102
"net" {
92103
$internalVariableGroups = '$(AzureSDK_Nuget_Release_Pipeline_Secrets) $(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
93104
$testVariableGroups = '$(Secrets_for_Resource_Provisioner)'
105+
$internalServiceConnections += ' "Azure SDK Symbols Publishing" Nuget.org'
94106
}
95107
"cpp" {
96108
$internalVariableGroups = '$(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations) $(Secrets_for_Resource_Provisioner)'
@@ -110,9 +122,16 @@ jobs:
110122
111123
Write-Host "InternalVariableGroups = $internalVariableGroups"
112124
Write-Host "TestVariableGroups = $testVariableGroups"
125+
Write-Host "TestServiceConnections = $testServiceConnections"
126+
Write-Host "InternalServiceConnections = $internalServiceConnections"
127+
Write-Host "GeneratePublicCIPipeline = $generatePublicCIPipeline"
113128
Write-Host "GenerateUnifiedWeekly = $generateUnifiedWeekly"
129+
114130
Write-Host "##vso[task.setvariable variable=InternalVariableGroups]$internalVariableGroups"
115131
Write-Host "##vso[task.setvariable variable=TestVariableGroups]$testVariableGroups"
132+
Write-Host "##vso[task.setvariable variable=TestServiceConnections]$testServiceConnections"
133+
Write-Host "##vso[task.setvariable variable=InternalServiceConnections]$internalServviceConnections"
134+
Write-host "##vso[task.setvariable variable=GeneratePublicCIPipeline]$generatePublicCIPipeline"
116135
Write-Host "##vso[task.setvariable variable=GenerateUnifiedWeekly]$generateUnifiedWeekly"
117136
displayName: Setup pipeline generation variables
118137
@@ -135,7 +154,9 @@ jobs:
135154
--branch refs/heads/$(DefaultBranch)
136155
--set-managed-variables
137156
--debug
157+
--serviceconnections "Azure"
138158
displayName: 'Generate ci pipelines for: ${{ parameters.Repository }}'
159+
condition: and(succeeded(), eq(variables['GeneratePublicCIPipeline'],'true'))
139160
continueOnError: true
140161
- task: AzureCLI@2
141162
inputs:
@@ -157,6 +178,7 @@ jobs:
157178
--set-managed-variables
158179
--debug
159180
--variablegroups $(InternalVariableGroups) $(TestVariableGroups)
181+
--serviceconnections $(InternalServiceConnections) $(TestServiceConnections)
160182
displayName: 'Generate release pipelines for: ${{ parameters.Repository }}'
161183
continueOnError: true
162184
- task: AzureCLI@2
@@ -179,6 +201,7 @@ jobs:
179201
--set-managed-variables
180202
--debug
181203
--variablegroups $(TestVariableGroups)
204+
--serviceconnections $(TestServiceConnections)
182205
displayName: 'Generate test pipelines for: ${{ parameters.Repository }}'
183206
condition: and(succeeded(), ne(variables['TestVariableGroups'],''))
184207
continueOnError: true
@@ -202,6 +225,7 @@ jobs:
202225
--set-managed-variables
203226
--debug
204227
--variablegroups $(TestVariableGroups)
228+
--serviceconnections $(TestServiceConnections)
205229
displayName: 'Generate weekly test pipelines (multi-cloud) for: ${{ parameters.Repository }}'
206230
condition: and(succeeded(), ne(variables['TestVariableGroups'],''))
207231
continueOnError: true
@@ -225,6 +249,7 @@ jobs:
225249
--set-managed-variables
226250
--debug
227251
--variablegroups $(InternalVariableGroups) $(TestVariableGroups)
252+
--serviceconnections $(InternalServiceConnections) $(TestServiceConnections)
228253
displayName: 'Generate weekly unified test pipelines (multi-cloud) for: ${{ parameters.Repository }}'
229-
condition: and(succeeded(), ne(variables['GenerateUnifiedWeekly'],''))
254+
condition: and(succeeded(), eq(variables['GenerateUnifiedWeekly'],'true'))
230255
continueOnError: true

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.20240604.1
12+
--version 1.1.0-dev.20241204.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)