Skip to content

Commit 146f44d

Browse files
mmitchemmitche
committed
Use delegation SAS for internal builds
1 parent b318324 commit 146f44d

File tree

5 files changed

+175
-174
lines changed

5 files changed

+175
-174
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-stream8'

‎.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-stream8'

‎eng/build-pr.yml‎

Lines changed: 74 additions & 71 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,34 +174,34 @@ 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)/**/*
193-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
194-
continueOnError: true
194+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
195+
continueOnError: true
195196
condition: always()
196-
197-
- task: PublishBuildArtifacts@1
198-
displayName: Publish Logs to VSTS
199-
inputs:
200-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
201-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
202-
publishLocation: Container
203-
continueOnError: true
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
204205
condition: always()
205206

206207
# AoT Jobs
@@ -246,6 +247,7 @@ jobs:
246247
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
247248
env:
248249
Token: $(dn-bot-dnceng-artifact-feeds-rw)
250+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
249251
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
250252
- powershell: eng\common\build.ps1
251253
$(_CIBuild)
@@ -313,25 +315,25 @@ jobs:
313315
RunAoTTests: 'true'
314316

315317
- ${{ if in(parameters.agentOs, 'Windows_NT', 'Darwin') }}:
316-
- task: CopyFiles@2
317-
displayName: Gather Logs
318-
inputs:
319-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
320-
Contents: |
321-
log/$(_BuildConfig)/**/*
322-
TestResults/$(_BuildConfig)/**/*
318+
- task: CopyFiles@2
319+
displayName: Gather Logs
320+
inputs:
321+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
322+
Contents: |
323+
log/$(_BuildConfig)/**/*
324+
TestResults/$(_BuildConfig)/**/*
323325
SymStore/$(_BuildConfig)/**/*
324-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
325-
continueOnError: true
326+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
327+
continueOnError: true
326328
condition: always()
327329

328-
- task: PublishBuildArtifacts@1
329-
displayName: Publish Logs to VSTS
330-
inputs:
331-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
332-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
333-
publishLocation: Container
334-
continueOnError: true
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
335337
condition: always()
336338

337339
# TemplateEngine Jobs
@@ -377,6 +379,7 @@ jobs:
377379
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
378380
env:
379381
Token: $(dn-bot-dnceng-artifact-feeds-rw)
382+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
380383
- ${{ if contains(parameters.agentOs, 'Windows_NT') }}:
381384
- powershell: eng\common\build.ps1
382385
$(_CIBuild)
@@ -444,34 +447,34 @@ jobs:
444447
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/dotnet-new.IntegrationTests.binlog
445448
$(_InternalRuntimeDownloadArgs)
446449
displayName: Run dotnet new Integration Tests
447-
450+
448451
- task: PublishTestResults@2
449-
displayName: Publish Test Results
450-
inputs:
451-
testResultsFormat: xUnit
452-
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
453-
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
454-
buildPlatform: '$(BuildPlatform)'
455-
buildConfiguration: '$(_BuildConfig)'
452+
displayName: Publish Test Results
453+
inputs:
454+
testResultsFormat: xUnit
455+
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
456+
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
457+
buildPlatform: '$(BuildPlatform)'
458+
buildConfiguration: '$(_BuildConfig)'
456459
condition: always()
457-
458-
- task: CopyFiles@2
459-
displayName: Gather Logs
460-
inputs:
461-
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
462-
Contents: |
463-
log/$(_BuildConfig)/**/*
464-
TestResults/$(_BuildConfig)/**/*
460+
461+
- task: CopyFiles@2
462+
displayName: Gather Logs
463+
inputs:
464+
SourceFolder: '$(Build.SourcesDirectory)/artifacts'
465+
Contents: |
466+
log/$(_BuildConfig)/**/*
467+
TestResults/$(_BuildConfig)/**/*
465468
SymStore/$(_BuildConfig)/**/*
466-
TargetFolder: '$(Build.ArtifactStagingDirectory)'
467-
continueOnError: true
469+
TargetFolder: '$(Build.ArtifactStagingDirectory)'
470+
continueOnError: true
471+
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
468480
condition: always()
469-
470-
- task: PublishBuildArtifacts@1
471-
displayName: Publish Logs to VSTS
472-
inputs:
473-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
474-
ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'
475-
publishLocation: Container
476-
continueOnError: true
477-
condition: always()

0 commit comments

Comments
 (0)