Skip to content

Commit 77c8eeb

Browse files
authored
Migrate to 1ES Templates (#712)
* Migrate Pipelines to new Templates
1 parent 8fffa00 commit 77c8eeb

File tree

1 file changed

+68
-56
lines changed

1 file changed

+68
-56
lines changed

Pipelines/asa-pr.yml

+68-56
Original file line numberDiff line numberDiff line change
@@ -22,66 +22,78 @@ resources:
2222
- repository: templates
2323
type: git
2424
name: SecurityEngineering/OSS-Tools-Pipeline-Templates
25-
ref: refs/tags/v1.1.1
25+
ref: refs/tags/v2.0.0
26+
- repository: 1esPipelines
27+
type: git
28+
name: 1ESPipelineTemplates/1ESPipelineTemplates
29+
ref: refs/tags/release
2630

2731
variables:
2832
BuildConfiguration: 'Release'
2933
DotnetVersion: '8.0.x'
3034
DotnetTargetFramework: 'net8.0'
3135

32-
stages:
33-
- stage: Test
34-
dependsOn: []
35-
jobs:
36-
- template: dotnet-test-job.yml@templates
37-
parameters:
38-
jobName: 'dotnet_test_windows'
39-
dotnetVersions: ['6.0.x','7.0.x','8.0.x']
40-
vmImage: 'win2022-image-base'
41-
projectPath: 'Tests/Tests.csproj'
42-
43-
- stage: SDL
44-
dependsOn: []
45-
jobs:
46-
- template: sdl-job.yml@templates
36+
extends:
37+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
38+
parameters:
39+
pool:
40+
name: MSSecurity-1ES-Build-Agents-Pool
41+
image: MSSecurity-1ES-Windows-2022
42+
os: windows
43+
stages:
44+
- stage: Test
45+
dependsOn: []
46+
jobs:
47+
- template: dotnet-test-job.yml@templates
48+
parameters:
49+
jobName: 'dotnet_test_windows'
50+
dotnetVersions: ['6.0.x','7.0.x','8.0.x']
51+
poolName: MSSecurity-1ES-Build-Agents-Pool
52+
poolImage: MSSecurity-1ES-Windows-2022
53+
poolOs: windows
54+
projectPath: 'Tests/Tests.csproj'
4755

48-
- stage: Build
49-
dependsOn: Test
50-
jobs:
51-
- template: dotnet-publish-linux-mac-job.yml@templates
52-
parameters:
53-
buildConfiguration: '${{ variables.BuildConfiguration }}'
54-
dotnetVersion: '${{ variables.DotnetVersion }}'
55-
targetFramework: '${{ variables.DotnetTargetFramework }}'
56-
projectPath: 'Cli/Cli.csproj'
57-
projectName: 'ASA'
58-
exePath: 'Asa'
59-
preBuild:
60-
- template: nbgv-set-version-steps.yml@templates
61-
- template: dotnet-publish-win-netcore-job.yml@templates
62-
parameters:
63-
buildConfiguration: '${{ variables.BuildConfiguration }}'
64-
dotnetVersion: '${{ variables.DotnetVersion }}'
65-
targetFramework: '${{ variables.DotnetTargetFramework }}'
66-
projectPath: 'Cli/Cli.csproj'
67-
projectName: 'ASA'
68-
preBuild:
69-
- template: nbgv-set-version-steps.yml@templates
70-
- template: nuget-build-job.yml@templates
71-
parameters:
72-
jobName: 'pack_lib'
73-
buildConfiguration: '${{ variables.BuildConfiguration }}'
74-
dotnetVersion: '${{ variables.DotnetVersion }}'
75-
projectPath: 'Lib/Lib.csproj'
76-
projectName: 'ASA_Lib'
77-
preBuild:
78-
- template: nbgv-set-version-steps.yml@templates
79-
- template: nuget-build-job.yml@templates
80-
parameters:
81-
jobName: 'pack_cli'
82-
buildConfiguration: '${{ variables.BuildConfiguration }}'
83-
dotnetVersion: '${{ variables.DotnetVersion }}'
84-
projectPath: 'Cli/Cli.csproj'
85-
projectName: 'ASA_Cli'
86-
preBuild:
87-
- template: nbgv-set-version-steps.yml@templates
56+
- stage: Build
57+
dependsOn: Test
58+
jobs:
59+
- template: dotnet-publish-linux-mac-job.yml@templates
60+
parameters:
61+
buildConfiguration: '${{ variables.BuildConfiguration }}'
62+
dotnetVersion: '${{ variables.DotnetVersion }}'
63+
targetFramework: '${{ variables.DotnetTargetFramework }}'
64+
projectPath: 'Cli/Cli.csproj'
65+
projectName: 'ASA'
66+
exePath: 'Asa'
67+
artifactName: 'linux-mac-archive'
68+
preBuild:
69+
- template: nbgv-set-version-steps.yml@templates
70+
- template: dotnet-publish-win-netcore-job.yml@templates
71+
parameters:
72+
buildConfiguration: '${{ variables.BuildConfiguration }}'
73+
dotnetVersion: '${{ variables.DotnetVersion }}'
74+
targetFramework: '${{ variables.DotnetTargetFramework }}'
75+
projectPath: 'Cli/Cli.csproj'
76+
projectName: 'ASA'
77+
artifactName: 'cli-archive'
78+
preBuild:
79+
- template: nbgv-set-version-steps.yml@templates
80+
- template: nuget-build-job.yml@templates
81+
parameters:
82+
jobName: 'pack_lib'
83+
buildConfiguration: '${{ variables.BuildConfiguration }}'
84+
dotnetVersion: '${{ variables.DotnetVersion }}'
85+
projectPath: 'Lib/Lib.csproj'
86+
projectName: 'ASA_Lib'
87+
artifactName: 'nuget-lib-archive'
88+
preBuild:
89+
- template: nbgv-set-version-steps.yml@templates
90+
- template: nuget-build-job.yml@templates
91+
parameters:
92+
jobName: 'pack_cli'
93+
buildConfiguration: '${{ variables.BuildConfiguration }}'
94+
dotnetVersion: '${{ variables.DotnetVersion }}'
95+
projectPath: 'Cli/Cli.csproj'
96+
projectName: 'ASA_Cli'
97+
artifactName: 'nuget-cli-archive'
98+
preBuild:
99+
- template: nbgv-set-version-steps.yml@templates

0 commit comments

Comments
 (0)