Skip to content

Commit 80d6bc1

Browse files
CopilotAndriySvyryd
Copilot
and
AndriySvyryd
committed
Address PR feedback: undo TestScope split, scope env vars per job, remove System.TeamProject condition, expiryInHours=3
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/343ccd50-5c61-480e-9b34-15064570b02c
1 parent 29b93bb commit 80d6bc1

3 files changed

Lines changed: 70 additions & 173 deletions

File tree

‎azure-pipelines-internal-tests.yml‎

Lines changed: 62 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -223,33 +223,22 @@ extends:
223223
arguments: 'locals all -clear'
224224
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
225225
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
226-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
227-
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
228-
parameters:
229-
federatedServiceConnection: 'dotnetbuilds-internal-read'
230-
outputVariableName: 'dotnetbuilds-internal-container-read-token'
231-
expiryInHours: 1
232-
base64Encode: false
233-
storageAccount: dotnetbuilds
234-
container: internal
235-
permissions: rl
226+
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
227+
parameters:
228+
federatedServiceConnection: 'dotnetbuilds-internal-read'
229+
outputVariableName: 'dotnetbuilds-internal-container-read-token'
230+
expiryInHours: 3
231+
base64Encode: false
232+
storageAccount: dotnetbuilds
233+
container: internal
234+
permissions: rl
236235
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
237236
displayName: Restore packages
238-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=UnitTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixUnit.binlog $(_InternalRuntimeDownloadArgs)
239-
displayName: Send unit tests to helix
240-
env:
241-
HelixAccessToken: $(_HelixAccessToken)
242-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
243-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
244-
COMPlus_EnableWriteXorExecute: 0
245-
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
246-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=FunctionalTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixFunctional.binlog $(_InternalRuntimeDownloadArgs)
247-
displayName: Send functional tests to helix
237+
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
238+
displayName: Send tests to helix
248239
env:
249240
HelixAccessToken: $(_HelixAccessToken)
250241
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
251-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
252-
COMPlus_EnableWriteXorExecute: 0
253242
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
254243

255244
- job: Helix_macOS_x64
@@ -276,32 +265,22 @@ extends:
276265
arguments: 'locals all -clear'
277266
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
278267
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
279-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
280-
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
281-
parameters:
282-
federatedServiceConnection: 'dotnetbuilds-internal-read'
283-
outputVariableName: 'dotnetbuilds-internal-container-read-token'
284-
expiryInHours: 1
285-
base64Encode: false
286-
storageAccount: dotnetbuilds
287-
container: internal
288-
permissions: rl
268+
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
269+
parameters:
270+
federatedServiceConnection: 'dotnetbuilds-internal-read'
271+
outputVariableName: 'dotnetbuilds-internal-container-read-token'
272+
expiryInHours: 3
273+
base64Encode: false
274+
storageAccount: dotnetbuilds
275+
container: internal
276+
permissions: rl
289277
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
290278
displayName: Restore packages
291-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=UnitTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixUnit.binlog $(_InternalRuntimeDownloadArgs)
292-
displayName: Send unit tests to helix
293-
env:
294-
HelixAccessToken: $(_HelixAccessToken)
295-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
296-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
297-
COMPlus_EnableWriteXorExecute: 0
298-
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
299-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=FunctionalTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixFunctional.binlog $(_InternalRuntimeDownloadArgs)
300-
displayName: Send functional tests to helix
279+
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
280+
displayName: Send tests to helix
301281
env:
302282
HelixAccessToken: $(_HelixAccessToken)
303283
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
304-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
305284
COMPlus_EnableWriteXorExecute: 0
306285
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
307286

@@ -329,33 +308,22 @@ extends:
329308
arguments: 'locals all -clear'
330309
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
331310
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
332-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
333-
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
334-
parameters:
335-
federatedServiceConnection: 'dotnetbuilds-internal-read'
336-
outputVariableName: 'dotnetbuilds-internal-container-read-token'
337-
expiryInHours: 1
338-
base64Encode: false
339-
storageAccount: dotnetbuilds
340-
container: internal
341-
permissions: rl
311+
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
312+
parameters:
313+
federatedServiceConnection: 'dotnetbuilds-internal-read'
314+
outputVariableName: 'dotnetbuilds-internal-container-read-token'
315+
expiryInHours: 3
316+
base64Encode: false
317+
storageAccount: dotnetbuilds
318+
container: internal
319+
permissions: rl
342320
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
343321
displayName: Restore packages
344-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=UnitTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixUnit.binlog $(_InternalRuntimeDownloadArgs)
345-
displayName: Send unit tests to helix
346-
env:
347-
HelixAccessToken: $(_HelixAccessToken)
348-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
349-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
350-
COMPlus_EnableWriteXorExecute: 0
351-
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
352-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=FunctionalTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixFunctional.binlog $(_InternalRuntimeDownloadArgs)
353-
displayName: Send functional tests to helix
322+
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
323+
displayName: Send tests to helix
354324
env:
355325
HelixAccessToken: $(_HelixAccessToken)
356326
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
357-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
358-
COMPlus_EnableWriteXorExecute: 0
359327
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
360328

361329
- job: Helix_Ubuntu_SqlServer
@@ -382,16 +350,15 @@ extends:
382350
arguments: 'locals all -clear'
383351
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
384352
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
385-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
386-
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
387-
parameters:
388-
federatedServiceConnection: 'dotnetbuilds-internal-read'
389-
outputVariableName: 'dotnetbuilds-internal-container-read-token'
390-
expiryInHours: 1
391-
base64Encode: false
392-
storageAccount: dotnetbuilds
393-
container: internal
394-
permissions: rl
353+
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
354+
parameters:
355+
federatedServiceConnection: 'dotnetbuilds-internal-read'
356+
outputVariableName: 'dotnetbuilds-internal-container-read-token'
357+
expiryInHours: 3
358+
base64Encode: false
359+
storageAccount: dotnetbuilds
360+
container: internal
361+
permissions: rl
395362
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
396363
displayName: Restore packages
397364
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
@@ -400,7 +367,6 @@ extends:
400367
HelixAccessToken: $(_HelixAccessToken)
401368
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
402369
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
403-
COMPlus_EnableWriteXorExecute: 0
404370
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
405371

406372
- job: Helix_Ubuntu_Cosmos
@@ -427,25 +393,22 @@ extends:
427393
arguments: 'locals all -clear'
428394
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
429395
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
430-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
431-
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
432-
parameters:
433-
federatedServiceConnection: 'dotnetbuilds-internal-read'
434-
outputVariableName: 'dotnetbuilds-internal-container-read-token'
435-
expiryInHours: 1
436-
base64Encode: false
437-
storageAccount: dotnetbuilds
438-
container: internal
439-
permissions: rl
396+
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
397+
parameters:
398+
federatedServiceConnection: 'dotnetbuilds-internal-read'
399+
outputVariableName: 'dotnetbuilds-internal-container-read-token'
400+
expiryInHours: 3
401+
base64Encode: false
402+
storageAccount: dotnetbuilds
403+
container: internal
404+
permissions: rl
440405
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
441406
displayName: Restore packages
442407
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
443408
displayName: Send tests to helix
444409
env:
445410
HelixAccessToken: $(_HelixAccessToken)
446411
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
447-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
448-
COMPlus_EnableWriteXorExecute: 0
449412
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
450413

451414
- job: Helix_Ubuntu
@@ -472,31 +435,20 @@ extends:
472435
arguments: 'locals all -clear'
473436
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
474437
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
475-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
476-
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
477-
parameters:
478-
federatedServiceConnection: 'dotnetbuilds-internal-read'
479-
outputVariableName: 'dotnetbuilds-internal-container-read-token'
480-
expiryInHours: 1
481-
base64Encode: false
482-
storageAccount: dotnetbuilds
483-
container: internal
484-
permissions: rl
438+
- template: /eng/common/core-templates/steps/get-delegation-sas.yml
439+
parameters:
440+
federatedServiceConnection: 'dotnetbuilds-internal-read'
441+
outputVariableName: 'dotnetbuilds-internal-container-read-token'
442+
expiryInHours: 3
443+
base64Encode: false
444+
storageAccount: dotnetbuilds
445+
container: internal
446+
permissions: rl
485447
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
486448
displayName: Restore packages
487-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=UnitTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixUnit.binlog $(_InternalRuntimeDownloadArgs)
488-
displayName: Send unit tests to helix
489-
env:
490-
HelixAccessToken: $(_HelixAccessToken)
491-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
492-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
493-
COMPlus_EnableWriteXorExecute: 0
494-
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
495-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:TestScope=FunctionalTests /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelixFunctional.binlog $(_InternalRuntimeDownloadArgs)
496-
displayName: Send functional tests to helix
449+
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
450+
displayName: Send tests to helix
497451
env:
498452
HelixAccessToken: $(_HelixAccessToken)
499453
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
500-
MSSQL_SA_PASSWORD: "PLACEHOLDERPass$$w0rd"
501-
COMPlus_EnableWriteXorExecute: 0
502454
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)

0 commit comments

Comments
 (0)