Skip to content

Commit ba7c1d8

Browse files
paulmedynskipaulmedynski
committed
Address PR 4073 review feedback and pool docs
1 parent c7d939e commit ba7c1d8

14 files changed

Lines changed: 66 additions & 41 deletions

‎eng/pipelines/onebranch/jobs/build-buildproj-job.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ parameters:
9292
jobs:
9393
- job: 'build_package_${{ parameters.packageShortName }}'
9494
displayName: 'Build: ${{ parameters.packageFullName }}'
95+
# Pool schema docs (OneBranch): https://aka.ms/obpipelines/yaml/jobs
96+
# Agent pool concepts (Azure Pipelines):
97+
# https://learn.microsoft.com/azure/devops/pipelines/agents/pools-queues
9598
pool:
9699
type: windows
97100

‎eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ jobs:
8686
artifactName: ${{ parameters.artifactName }}
8787
targetPath: $(artifactPath)
8888

89+
# Pool schema docs (OneBranch): https://aka.ms/obpipelines/yaml/jobs
90+
# Agent pool concepts (Azure Pipelines):
91+
# https://learn.microsoft.com/azure/devops/pipelines/agents/pools-queues
8992
pool:
9093
type: release
9194

‎eng/pipelines/onebranch/jobs/publish-symbols-job.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ parameters:
4949
jobs:
5050
- job: 'publish_symbols_${{ parameters.packageShortName }}'
5151
displayName: 'Publish Symbols: ${{ parameters.packageFullName }}'
52+
# Pool schema docs (OneBranch): https://aka.ms/obpipelines/yaml/jobs
53+
# Agent pool concepts (Azure Pipelines):
54+
# https://learn.microsoft.com/azure/devops/pipelines/agents/pools-queues
5255
pool:
5356
type: linux
5457

‎eng/pipelines/onebranch/jobs/validate-signed-package-job.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,20 @@ parameters:
3636
- name: isOfficial
3737
type: boolean
3838

39-
# True if this build is a preview.
40-
- name: isPreview
41-
type: boolean
42-
4339
jobs:
4440
- job: validate_signed_package
4541
displayName: Verify SqlClient NuGet Package
4642

43+
# Pool schema docs (OneBranch): https://aka.ms/obpipelines/yaml/jobs
44+
# Agent pool concepts (Azure Pipelines):
45+
# https://learn.microsoft.com/azure/devops/pipelines/agents/pools-queues
4746
pool:
48-
type: windows # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
47+
type: windows
4948
isCustom: true
5049
name: ADO-1ES-Pool
5150
vmImage: ADO-Win25
5251

53-
variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
52+
variables:
5453

5554
# Path within the downloaded artifact where NuGet packages are located.
5655
- name: artifactPath

‎eng/pipelines/onebranch/jobs/validate-symbols-job.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
- job: validate_symbols
3838
displayName: Verify symbols on symbol servers
3939

40+
# Pool schema docs (OneBranch): https://aka.ms/obpipelines/yaml/jobs
41+
# Agent pool concepts (Azure Pipelines):
42+
# https://learn.microsoft.com/azure/devops/pipelines/agents/pools-queues
4043
pool:
4144
type: windows
4245
isCustom: true

‎eng/pipelines/onebranch/scripts/tests/validate-symbols.Tests.ps1‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,35 @@ Describe 'Package discovery' {
183183
$result.StdOut | Should -Match 'Found:.*MyPackage\.1\.0\.0\.nupkg'
184184
}
185185

186+
It 'finds nupkg under packages subfolder' {
187+
$artifactDir = Join-Path $TestDrive 'nested_artifacts'
188+
$packageDir = Join-Path $artifactDir 'packages'
189+
$extractDir = Join-Path $TestDrive 'extract_nested'
190+
New-Item -ItemType Directory -Force -Path $packageDir | Out-Null
191+
192+
$dllRel = Join-Path 'lib' 'net8.0' 'NestedPackage.dll'
193+
New-FakeNupkg -OutputDir $packageDir `
194+
-PackageName 'NestedPackage' `
195+
-Version '1.2.3' `
196+
-DllRelativePath $dllRel
197+
198+
$result = Invoke-ValidateSymbols @{
199+
ArtifactPath = $artifactDir
200+
ExtractPath = $extractDir
201+
PackageName = 'NestedPackage'
202+
DllPath = $dllRel
203+
SymbolServerUrl = $Script:CommonParams.SymbolServerUrl
204+
SymbolServerName = $Script:CommonParams.SymbolServerName
205+
MaxRetries = '1'
206+
RetryIntervalSeconds = '0'
207+
}
208+
209+
$extractedDll = Join-Path $extractDir $dllRel
210+
$extractedDll | Should -Exist
211+
$result.ExitCode | Should -Be 1
212+
$result.StdOut | Should -Match 'Found:.*NestedPackage\.1\.2\.3\.nupkg'
213+
}
214+
186215
It 'skips extraction when DLL already exists' {
187216
$artifactDir = Join-Path $TestDrive 'pre_extracted_artifacts'
188217
$extractDir = Join-Path $TestDrive 'pre_extracted'

‎eng/pipelines/onebranch/scripts/validate-symbols.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ if (-not (Test-Path $dllFullPath)) {
8989

9090
New-Item -ItemType Directory -Force -Path $ExtractPath | Out-Null
9191

92-
$nupkg = Get-ChildItem -Path $ArtifactPath -Filter "$PackageName.*.nupkg" `
92+
$nupkg = Get-ChildItem -Path $ArtifactPath -Recurse -File -Filter "$PackageName.*.nupkg" `
9393
| Where-Object { $_.Name -notlike '*.snupkg' } `
9494
| Select-Object -First 1
9595

‎eng/pipelines/onebranch/sqlclient-non-official.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,13 @@ extends:
235235
parameters:
236236
debug: ${{ parameters.debug }}
237237
isOfficial: false
238-
isPreview: ${{ parameters.isPreview }}
239238
publishSymbols: ${{ parameters.publishSymbols }}
240239
buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
241240
buildSqlClient: ${{ parameters.buildSqlClient }}
242-
buildAKVProvider: ${{ parameters.buildAKVProvider }}
241+
buildAKVProvider: ${{ parameters.buildAkvProvider }}
243242

244243
- template: /eng/pipelines/onebranch/stages/release-stage.yml@self
245244
parameters:
246-
debug: ${{ parameters.debug }}
247245
isOfficial: false
248246
# Non-official pipelines always push to the NuGet Test feed.
249247
releaseToProduction: false

‎eng/pipelines/onebranch/sqlclient-official.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,13 @@ extends:
269269
parameters:
270270
debug: ${{ parameters.debug }}
271271
isOfficial: true
272-
isPreview: ${{ parameters.isPreview }}
273272
publishSymbols: ${{ parameters.publishSymbols }}
274273
buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
275274
buildSqlClient: ${{ parameters.buildSqlClient }}
276-
buildAKVProvider: ${{ parameters.buildAKVProvider }}
275+
buildAKVProvider: ${{ parameters.buildAkvProvider }}
277276

278277
- template: /eng/pipelines/onebranch/stages/release-stage.yml@self
279278
parameters:
280-
debug: ${{ parameters.debug }}
281279
isOfficial: true
282280
releaseToProduction: ${{ parameters.releaseToProduction }}
283281
stageNameSuffix: production

‎eng/pipelines/onebranch/stages/build-stages.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@
2424
# - build_dependent stage name is intentionally stable because downstream
2525
# templates depend on it by name.
2626
#
27-
# This template depends on the following runtime (i.e. macro expansion) variables being defined:
28-
#
29-
# - effectiveSqlServerVersion
30-
# - effectiveLoggingVersion
31-
# - effectiveAbstractionsVersion
32-
# - effectiveSqlClientVersion
33-
# - effectiveAzureVersion
34-
# - effectiveAkvProviderVersion
35-
3627
parameters:
3728
# ── General parameters ─────────────────────────────────────────────────
3829

0 commit comments

Comments
 (0)