Skip to content

Commit 16db5b6

Browse files
mmitchemmitche
committed
Use delegation SAS for internal builds
1 parent 6e63541 commit 16db5b6

File tree

5 files changed

+174
-173
lines changed

5 files changed

+174
-173
lines changed

‎.vsts-ci-richnav.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stages:
2626
richCodeNavigationEnvironment: 'production'
2727
pool:
2828
name: $(DncEngPublicBuildPool)
29-
demands: ImageOverride -equals windows.vs2019.amd64.open
29+
demands: ImageOverride -equals windows.vs2019.amd64.open
3030
timeoutInMinutes: 180
3131
strategy:
3232
matrix:
@@ -45,6 +45,7 @@ stages:
4545
- _SignArgs: ''
4646
- _InternalRuntimeDownloadArgs: ''
4747
steps:
48+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
4849
- powershell: eng\common\build.ps1
4950
-restore
5051
-ci
@@ -65,23 +66,23 @@ stages:
6566
TestFullMSBuild: 'true'
6667
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6768

68-
- task: CopyFiles@2
69-
displayName: Gather Logs
70-
inputs:
71-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
72-
Contents: |
73-
log/$(_BuildConfig)/**/*
74-
TestResults/$(_BuildConfig)/**/*
75-
SymStore/$(_BuildConfig)/**/*
76-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
77-
continueOnError: true
69+
- task: CopyFiles@2
70+
displayName: Gather Logs
71+
inputs:
72+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
73+
Contents: |
74+
log/$(_BuildConfig)/**/*
75+
TestResults/$(_BuildConfig)/**/*
76+
SymStore/$(_BuildConfig)/**/*
77+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
78+
continueOnError: true
7879
condition: always()
7980

80-
- task: PublishBuildArtifacts@1
81-
displayName: Publish Logs to VSTS
82-
inputs:
83-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
84-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
85-
publishLocation: Container
86-
continueOnError: true
81+
- task: PublishBuildArtifacts@1
82+
displayName: Publish Logs to VSTS
83+
inputs:
84+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
85+
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
86+
publishLocation: Container
87+
continueOnError: true
8788
condition: always()

‎.vsts-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ variables:
3636
value: /p:OfficialBuilder=Microsoft
3737
- name: Codeql.Enabled
3838
value: true
39-
- group: DotNetBuilds storage account read tokens
4039
- name: _InternalRuntimeDownloadArgs
41-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
42-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
40+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
41+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
4342
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
4443
- group: DotNet-CLI-SDLValidation-Params
4544
- template: /eng/common/templates-official/variables/pool-providers.yml
@@ -115,6 +114,7 @@ extends:
115114
value: ''
116115
- template: /eng/common/templates-official/job/source-build.yml@self
117116
parameters:
117+
enableInternalSources: true
118118
platform:
119119
name: 'Managed'
120120
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'

‎.vsts-pr.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,8 @@ pr:
1818
variables:
1919
- name: teamName
2020
value: Roslyn-Project-System
21-
- name: _DotNetPublishToBlobFeed
22-
value: false
2321
- name: _CIBuild
2422
value: -restore -build -sign -pack -ci
25-
- name: _DotNetArtifactsCategory
26-
value: .NETCore
27-
- name: _DotNetValidationArtifactsCategory
28-
value: .NETCore
2923
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
3024
- name: PostBuildSign
3125
value: false
@@ -44,10 +38,9 @@ variables:
4438
value: /p:OfficialBuilder=Microsoft
4539
- name: Codeql.Enabled
4640
value: true
47-
- group: DotNetBuilds storage account read tokens
4841
- name: _InternalRuntimeDownloadArgs
49-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
50-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
42+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
43+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
5144
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
5245
- group: DotNet-CLI-SDLValidation-Params
5346
- template: /eng/common/templates/variables/pool-providers.yml
@@ -64,9 +57,9 @@ stages:
6457
name: $(DncEngInternalBuildPool)
6558
demands: ImageOverride -equals windows.vs2019.amd64
6659
steps:
67-
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
68-
artifact: BuildConfiguration
69-
displayName: Publish Build Config
60+
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
61+
artifact: BuildConfiguration
62+
displayName: Publish Build Config
7063
- template: /eng/build-pr.yml
7164
parameters:
7265
agentOs: Windows_NT
@@ -94,6 +87,7 @@ stages:
9487
_Test: ''
9588
- template: /eng/common/templates/job/source-build.yml
9689
parameters:
90+
enableInternalSources: true
9791
platform:
9892
name: 'Managed'
9993
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'

‎eng/build-pr.yml

Lines changed: 73 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
5757
- _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
5858
- _PerfIterations: 25
59-
59+
6060
steps:
6161
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
6262
- task: PowerShell@2
@@ -66,6 +66,7 @@ jobs:
6666
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
6767
env:
6868
Token: $(dn-bot-dnceng-artifact-feeds-rw)
69+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
6970
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
7071
- powershell: eng\common\build.ps1
7172
$(_CIBuild)
@@ -98,7 +99,7 @@ jobs:
9899
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
99100
HelixAccessToken: $(_HelixApiToken)
100101
RunAoTTests: 'false'
101-
102+
102103
- ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}:
103104
- powershell: eng\common\build.ps1
104105
$(_CIBuild)
@@ -130,7 +131,7 @@ jobs:
130131
TestFullMSBuild: 'true'
131132
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
132133
HelixAccessToken: $(_HelixApiToken)
133-
134+
134135
- ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}:
135136
- powershell: eng\common\build.ps1
136137
$(_CIBuild)
@@ -142,7 +143,7 @@ jobs:
142143
displayName: Build
143144
env:
144145
BuildConfig: $(_BuildConfig)
145-
146+
146147
- ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}:
147148
- script: eng/common/build.sh
148149
$(_CIBuild)
@@ -173,35 +174,35 @@ jobs:
173174
RunAoTTests: 'false'
174175

175176
- task: PublishTestResults@2
176-
displayName: Publish Test Results
177-
inputs:
178-
testResultsFormat: xUnit
179-
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
180-
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
181-
buildPlatform: '$(BuildPlatform)'
182-
buildConfiguration: '$(_BuildConfig)'
177+
displayName: Publish Test Results
178+
inputs:
179+
testResultsFormat: xUnit
180+
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
181+
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
182+
buildPlatform: '$(BuildPlatform)'
183+
buildConfiguration: '$(_BuildConfig)'
183184
condition: always()
184185

185-
- task: CopyFiles@2
186-
displayName: Gather Logs
187-
inputs:
188-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
189-
Contents: |
190-
log/$(_BuildConfig)/**/*
191-
TestResults/$(_BuildConfig)/**/*
186+
- task: CopyFiles@2
187+
displayName: Gather Logs
188+
inputs:
189+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
190+
Contents: |
191+
log/$(_BuildConfig)/**/*
192+
TestResults/$(_BuildConfig)/**/*
192193
SymStore/$(_BuildConfig)/**/*
193194
tmp/$(_BuildConfig)/**/*.binlog
194-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
195-
continueOnError: true
195+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
196+
continueOnError: true
196197
condition: always()
197-
198-
- task: PublishBuildArtifacts@1
199-
displayName: Publish Logs to VSTS
200-
inputs:
201-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
202-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
203-
publishLocation: Container
204-
continueOnError: true
198+
199+
- task: PublishBuildArtifacts@1
200+
displayName: Publish Logs to VSTS
201+
inputs:
202+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
203+
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
204+
publishLocation: Container
205+
continueOnError: true
205206
condition: always()
206207

207208
# AoT Jobs
@@ -247,6 +248,7 @@ jobs:
247248
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
248249
env:
249250
Token: $(dn-bot-dnceng-artifact-feeds-rw)
251+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
250252
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
251253
- powershell: eng\common\build.ps1
252254
$(_CIBuild)
@@ -314,26 +316,26 @@ jobs:
314316
RunAoTTests: 'true'
315317

316318
- ${{ if in(parameters.agentOs, 'Windows_NT', 'Darwin') }}:
317-
- task: CopyFiles@2
318-
displayName: Gather Logs
319-
inputs:
320-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
321-
Contents: |
322-
log/$(_BuildConfig)/**/*
323-
TestResults/$(_BuildConfig)/**/*
319+
- task: CopyFiles@2
320+
displayName: Gather Logs
321+
inputs:
322+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
323+
Contents: |
324+
log/$(_BuildConfig)/**/*
325+
TestResults/$(_BuildConfig)/**/*
324326
SymStore/$(_BuildConfig)/**/*
325327
tmp/$(_BuildConfig)/**/*.binlog
326-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
327-
continueOnError: true
328+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
329+
continueOnError: true
328330
condition: always()
329331

330-
- task: PublishBuildArtifacts@1
331-
displayName: Publish Logs to VSTS
332-
inputs:
333-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
334-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
335-
publishLocation: Container
336-
continueOnError: true
332+
- task: PublishBuildArtifacts@1
333+
displayName: Publish Logs to VSTS
334+
inputs:
335+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
336+
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
337+
publishLocation: Container
338+
continueOnError: true
337339
condition: always()
338340

339341
# TemplateEngine Jobs
@@ -379,6 +381,7 @@ jobs:
379381
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
380382
env:
381383
Token: $(dn-bot-dnceng-artifact-feeds-rw)
384+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
382385
- ${{ if contains(parameters.agentOs, 'Windows_NT') }}:
383386
- powershell: eng\common\build.ps1
384387
$(_CIBuild)
@@ -446,35 +449,35 @@ jobs:
446449
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/dotnet-new.IntegrationTests.binlog
447450
$(_InternalRuntimeDownloadArgs)
448451
displayName: Run dotnet new Integration Tests
449-
452+
450453
- task: PublishTestResults@2
451-
displayName: Publish Test Results
452-
inputs:
453-
testResultsFormat: xUnit
454-
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
455-
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
456-
buildPlatform: '$(BuildPlatform)'
457-
buildConfiguration: '$(_BuildConfig)'
454+
displayName: Publish Test Results
455+
inputs:
456+
testResultsFormat: xUnit
457+
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
458+
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
459+
buildPlatform: '$(BuildPlatform)'
460+
buildConfiguration: '$(_BuildConfig)'
458461
condition: always()
459-
460-
- task: CopyFiles@2
461-
displayName: Gather Logs
462-
inputs:
463-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
464-
Contents: |
465-
log/$(_BuildConfig)/**/*
466-
TestResults/$(_BuildConfig)/**/*
462+
463+
- task: CopyFiles@2
464+
displayName: Gather Logs
465+
inputs:
466+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
467+
Contents: |
468+
log/$(_BuildConfig)/**/*
469+
TestResults/$(_BuildConfig)/**/*
467470
SymStore/$(_BuildConfig)/**/*
468471
tmp/$(_BuildConfig)/**/*.binlog
469-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
470-
continueOnError: true
472+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
473+
continueOnError: true
471474
condition: always()
472-
473-
- task: PublishBuildArtifacts@1
474-
displayName: Publish Logs to VSTS
475-
inputs:
476-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
477-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
478-
publishLocation: Container
479-
continueOnError: true
475+
476+
- task: PublishBuildArtifacts@1
477+
displayName: Publish Logs to VSTS
478+
inputs:
479+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
480+
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
481+
publishLocation: Container
482+
continueOnError: true
480483
condition: always()

0 commit comments

Comments
 (0)