Skip to content

Commit 147e4e2

Browse files
HongGitHongGit
authored
update the public and internal pipelines (#5450)
* update the public and internal pipelines * bring back loc section in PR pipeline
1 parent 07b50df commit 147e4e2

File tree

2 files changed

+109
-156
lines changed

2 files changed

+109
-156
lines changed

‎azure-pipelines-arcade-PR.yml

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@ variables:
3131
value: true
3232
- name: _RunAsInternal
3333
value: false
34-
35-
# TOD delete after testing
36-
#- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
37-
# - name: _RunAsPublic
38-
# value: false
39-
# - name: _RunAsInternal
40-
# value: true
41-
# - group: DotNet-Wcf-SDLValidation-Params
34+
35+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
36+
- name: _RunAsPublic
37+
value: false
38+
- name: _RunAsInternal
39+
value: true
40+
- group: DotNet-Wcf-SDLValidation-Params
4241

4342
resources:
4443
containers:
@@ -70,31 +69,11 @@ stages:
7069
${{ if eq(variables._RunAsPublic, True) }}:
7170
name: NetCore-Public
7271
demands: ImageOverride -equals windows.vs2022.amd64.open
73-
${{ if eq(variables._RunAsInternal, True) }}:
74-
name: NetCore1ESPool-Internal
75-
demands: ImageOverride -equals windows.vs2022.amd64
7672
variables:
7773
- _InternalBuildArgs: ''
7874
- HelixApiAccessToken: ''
7975
- _TestArgs: /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true
8076

81-
# TODO delete after testing
82-
# # Internal/Official Build Variables
83-
# - ${{ if eq(variables._RunAsInternal, True) }}:
84-
# # Only enable publishing in non-public, non PR scenarios.
85-
# # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
86-
# # DotNet-HelixApi-Access provides: HelixApiAccessToken
87-
# - group: Publish-Build-Assets
88-
# - group: DotNet-HelixApi-Access
89-
# - _PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
90-
# - _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
91-
# /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
92-
# /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
93-
# /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
94-
# /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
95-
# # Service uri needed for integration tests in official builds
96-
# - _serviceUri: wcfcoresrv53.westus3.cloudapp.azure.com/WcfTestService1
97-
9877
# Public/PR & CI Build Variables
9978
- ${{ if eq(variables._RunAsPublic, True) }}:
10079
# For PR and CI test runs we use a different server machine that host multiple services to avoid concurrency issues.
@@ -116,10 +95,6 @@ stages:
11695
_SignType: test
11796
_DotNetPublishToBlobFeed : false
11897
_WcfPRServiceId: 1
119-
# TODO delete after testing
120-
# ${{ if eq(variables._RunAsInternal, True) }}:
121-
# _SignType: real
122-
# _DotNetPublishToBlobFeed : true
12398
${{ if eq(variables._RunAsPublic, True) }}:
12499
Debug:
125100
_BuildConfig: Debug
@@ -278,31 +253,4 @@ stages:
278253
ServiceHost: $(_serviceUri)
279254
RunAsPublic: $(_RunAsPublic)
280255
RunAsInternal: $(_RunAsInternal)
281-
IsWindowsBuild: false
282-
283-
# - TODO delete after testing
284-
# - ${{ if eq(variables._RunAsInternal, True) }}:
285-
# - template: eng\common\templates\post-build\post-build.yml
286-
# parameters:
287-
# validateDependsOn:
288-
# - Build
289-
# publishingInfraVersion: 3
290-
# # Symbol validation isn't being very reliable lately. This should be enabled back
291-
# # once this issue is resolved: https://github.com/dotnet/arcade/issues/2871
292-
# enableSymbolValidation: false
293-
# # Sourcelink validation isn't passing for Arcade due to some regressions. This should be
294-
# # enabled back once this issue is resolved: https://github.com/dotnet/arcade/issues/2912
295-
# enableSourceLinkValidation: false
296-
# # This is to enable SDL runs part of Post-Build Validation Stage
297-
# SDLValidationParameters:
298-
# enable: true
299-
# params: ' -SourceToolsList @("policheck","credscan")
300-
# -TsaInstanceURL $(_TsaInstanceURL)
301-
# -TsaProjectName $(_TsaProjectName)
302-
# -TsaNotificationEmail $(_TsaNotificationEmail)
303-
# -TsaCodebaseAdmin $(_TsaCodebaseAdmin)
304-
# -TsaBugAreaPath $(_TsaBugAreaPath)
305-
# -TsaIterationPath $(_TsaIterationPath)
306-
# -TsaRepositoryName "WCF"
307-
# -TsaCodebaseName "WCF"
308-
# -TsaPublish $True'
256+
IsWindowsBuild: false

‎azure-pipelines-arcade.yml

Lines changed: 101 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# trigger ci builds for merged PRs into listed branches
2-
# Setting batch to true, triggers one build at a time.
3-
# if there is a push while a build in progress, it will wait,
4-
# until the running build finishes, and produce a build with all the changes
1+
# This Yaml Document has been converted by ESAI Yaml Pipeline Conversion Tool.
2+
# Please make sure to check all the converted content, it is your team's responsibility to make sure that the pipeline is still valid and functions as expected.
3+
# This pipeline will be extended to the MicroBuild template
54
trigger:
65
batch: true
76
branches:
@@ -11,97 +10,103 @@ trigger:
1110
- release/4.*
1211
- release/6.*
1312

14-
variables:
15-
- name: _TeamName
16-
value: WcfCore
17-
- name: _PublishUsingPipelines
18-
value: true
19-
- name: _DotNetArtifactsCategory
20-
value: .NETCore
21-
- name: _RunAsPublic
22-
value: false
23-
- name: _RunAsInternal
24-
value: true
25-
- group: DotNet-Wcf-SDLValidation-Params
26-
27-
stages:
28-
- stage: Build
29-
displayName: Build
30-
jobs:
31-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
32-
- template: /eng/common/templates/job/onelocbuild.yml
33-
parameters:
34-
MirrorRepo: wcf
35-
LclSource: lclFilesfromPackage
36-
LclPackageId: 'LCL-JUNO-PROD-WCF'
37-
- template: /eng/common/templates/jobs/jobs.yml
38-
parameters:
39-
enableMicrobuild: true
40-
enablePublishBuildArtifacts: true
41-
enablePublishBuildAssets: true
42-
enablePublishUsingPipelines: $(_PublishUsingPipelines)
43-
enableTelemetry: true
44-
helixRepo: dotnet/wcf
13+
variables:
14+
- template: /eng/common/templates-official/variables/pool-providers.yml@self
15+
- name: _TeamName
16+
value: WcfCore
17+
- name: TeamName
18+
value: WcfCore
19+
- name: _PublishUsingPipelines
20+
value: true
21+
- name: _DotNetArtifactsCategory
22+
value: .NETCore
23+
- name: _RunAsPublic
24+
value: false
25+
- name: _RunAsInternal
26+
value: true
27+
- group: DotNet-Wcf-SDLValidation-Params
28+
resources:
29+
repositories:
30+
- repository: MicroBuildTemplate
31+
type: git
32+
name: 1ESPipelineTemplates/MicroBuildTemplate
33+
ref: refs/tags/release
34+
extends:
35+
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
36+
parameters:
37+
sdl:
38+
sourceAnalysisPool:
39+
name: $(DncEngInternalBuildPool)
40+
image: 1es-windows-2022-pt
41+
os: windows
42+
customBuildTags:
43+
- ES365AIMigrationTooling
44+
stages:
45+
- stage: Build
46+
displayName: Build
4547
jobs:
46-
- job: Windows
47-
timeoutInMinutes: 90
48-
pool:
49-
name: NetCore1ESPool-Internal
50-
demands: ImageOverride -equals windows.vs2022.amd64
51-
variables:
52-
- _InternalBuildArgs: ''
53-
- HelixApiAccessToken: ''
54-
- _TestArgs: /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true
55-
56-
# Internal/Official Build Variables
57-
- ${{ if eq(variables._RunAsInternal, True) }}:
58-
# Only enable publishing in non-public, non PR scenarios.
59-
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
60-
# DotNet-HelixApi-Access provides: HelixApiAccessToken
61-
- group: Publish-Build-Assets
62-
- group: DotNet-HelixApi-Access
63-
- _PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
64-
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
65-
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
66-
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
67-
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
68-
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
69-
# Service uri needed for integration tests in official builds
70-
- _serviceUri: wcfcoresrv53.westus3.cloudapp.azure.com/WcfTestService1
71-
72-
# Send to Helix variables
73-
- _xUnitWorkItemTimeout: '00:10:00'
74-
75-
strategy:
76-
matrix:
77-
Release:
78-
_BuildConfig: Release
48+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
49+
- template: /eng/common/templates-official/job/onelocbuild.yml@self
50+
parameters:
51+
MirrorRepo: wcf
52+
LclSource: lclFilesfromPackage
53+
LclPackageId: 'LCL-JUNO-PROD-WCF'
54+
- template: /eng/common/templates-official/jobs/jobs.yml@self
55+
parameters:
56+
enableMicrobuild: true
57+
enablePublishBuildArtifacts: true
58+
enablePublishBuildAssets: true
59+
enablePublishUsingPipelines: $(_PublishUsingPipelines)
60+
enableTelemetry: true
61+
helixRepo: dotnet/wcf
62+
jobs:
63+
- job: Windows
64+
timeoutInMinutes: 90
65+
pool:
7966
${{ if eq(variables._RunAsInternal, True) }}:
80-
_SignType: real
81-
_DotNetPublishToBlobFeed : true
82-
83-
- ${{ if eq(variables._RunAsInternal, True) }}:
84-
- template: eng\common\templates\post-build\post-build.yml
85-
parameters:
86-
validateDependsOn:
87-
- Build
88-
publishingInfraVersion: 3
89-
# Symbol validation isn't being very reliable lately. This should be enabled back
90-
# once this issue is resolved: https://github.com/dotnet/arcade/issues/2871
91-
enableSymbolValidation: false
92-
# Sourcelink validation isn't passing for Arcade due to some regressions. This should be
93-
# enabled back once this issue is resolved: https://github.com/dotnet/arcade/issues/2912
94-
enableSourceLinkValidation: false
95-
# This is to enable SDL runs part of Post-Build Validation Stage
96-
SDLValidationParameters:
97-
enable: true
98-
params: ' -SourceToolsList @("policheck","credscan")
99-
-TsaInstanceURL $(_TsaInstanceURL)
100-
-TsaProjectName $(_TsaProjectName)
101-
-TsaNotificationEmail $(_TsaNotificationEmail)
102-
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
103-
-TsaBugAreaPath $(_TsaBugAreaPath)
104-
-TsaIterationPath $(_TsaIterationPath)
105-
-TsaRepositoryName "WCF"
106-
-TsaCodebaseName "WCF"
107-
-TsaPublish $True'
67+
name: $(DncEngInternalBuildPool)
68+
image: 1es-windows-2022-pt
69+
os: windows
70+
variables:
71+
- _InternalBuildArgs: ''
72+
- HelixApiAccessToken: ''
73+
- _TestArgs: /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true
74+
- ${{ if eq(variables._RunAsInternal, True) }}:
75+
- group: Publish-Build-Assets
76+
- group: DotNet-HelixApi-Access
77+
- _PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
78+
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
79+
- _serviceUri: wcfcoresrv53.westus3.cloudapp.azure.com/WcfTestService1
80+
- _xUnitWorkItemTimeout: '00:10:00'
81+
strategy:
82+
matrix:
83+
Release:
84+
_BuildConfig: Release
85+
${{ if eq(variables._RunAsInternal, True) }}:
86+
_SignType: real
87+
_DotNetPublishToBlobFeed: true
88+
steps:
89+
- checkout: self
90+
clean: true
91+
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -preparemachine $(_InternalBuildArgs) $(_TestArgs) /p:Test=false
92+
displayName: Windows Build / Publish
93+
- powershell: eng\common\build.ps1 -configuration $(_BuildConfig) -preparemachine -ci -test -integrationTest -projects $(Build.SourcesDirectory)/eng/SendToHelix.proj $(_TestArgs) /p:TestJob=Windows /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
94+
displayName: Windows - Run Helix Tests
95+
env:
96+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
97+
HelixAccessToken: $(HelixApiAccessToken)
98+
XUnitWorkItemTimeout: $(_xUnitWorkItemTimeout)
99+
RunAsPublic: $(_RunAsPublic)
100+
RunAsInternal: $(_RunAsInternal)
101+
IsWindowsBuild: true
102+
- ${{ if eq(variables._RunAsInternal, True) }}:
103+
- template: /eng/common/templates-official/post-build/post-build.yml@self
104+
parameters:
105+
validateDependsOn:
106+
- Build
107+
publishingInfraVersion: 3
108+
enableSymbolValidation: false
109+
enableSourceLinkValidation: false
110+
SDLValidationParameters:
111+
enable: true
112+
params: ' -SourceToolsList @("policheck","credscan") -TsaInstanceURL $(_TsaInstanceURL) -TsaProjectName $(_TsaProjectName) -TsaNotificationEmail $(_TsaNotificationEmail) -TsaCodebaseAdmin $(_TsaCodebaseAdmin) -TsaBugAreaPath $(_TsaBugAreaPath) -TsaIterationPath $(_TsaIterationPath) -TsaRepositoryName "WCF" -TsaCodebaseName "WCF" -TsaPublish $True'

0 commit comments

Comments
 (0)