这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: change to use DncEngInternalBuildPool pool variable and windows … #1137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2024
Merged

fix: change to use DncEngInternalBuildPool pool variable and windows … #1137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66c55a5
fix: change to use DncEngInternalBuildPool pool variable and windows …
dalehhirt Mar 12, 2024
40e2795
Merge branch 'main' into dev/dalehirt/1ESPoolIssues
colombod Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions azure-pipelines-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,25 @@ resources:
ref: refs/tags/release

variables:
- name: _TeamName
value: DotNetTry
- name: _BuildConfig
value: Release
- name: _PublishUsingPipelines
value: true
- name: _DotNetArtifactsCategory
value: .NETCore
- name: DotNetSdkVersion
value: '8.0.101'
- name: NodeJSVersion
value: '16.13.0'
- name: TryDotNetPackagesPath
value: $(Build.SourcesDirectory)/artifacts/.trydotnet/packages
- name: RunIntegrationTests
value: true
- name: Codeql.Enabled
value: true
- template: /eng/common/templates/variables/pool-providers.yml@self
- name: _TeamName
value: DotNetTry
- name: _BuildConfig
value: Release
- name: _PublishUsingPipelines
value: true
- name: _DotNetArtifactsCategory
value: .NETCore
- name: DotNetSdkVersion
value: '8.0.101'
- name: NodeJSVersion
value: '16.13.0'
- name: TryDotNetPackagesPath
value: $(Build.SourcesDirectory)/artifacts/.trydotnet/packages
- name: RunIntegrationTests
value: true
- name: Codeql.Enabled
value: true

extends:
# The pipeline extends the 1ES PT which will inject different SDL and compliance tasks.
Expand All @@ -49,8 +50,8 @@ extends:
parameters:
# Update the pool with your team's 1ES hosted pool.
pool:
name: NetCore1ESPool-Internal # Name of your hosted pool
image: windows.vs2022.amd64 # Name of the image in your pool. If not specified, first image of the pool is used
name: $(DncEngInternalBuildPool) # Name of your hosted pool
image: 1es-windows-2022-pt # Name of the image in your pool. If not specified, first image of the pool is used
os: windows # OS of the image. This value cannot be a variable. Allowed values: windows, linux, macOS

# Build Tags
Expand All @@ -61,9 +62,6 @@ extends:
sdl:
git:
longpaths: true
psscriptanalyzer: # Allowed values: credscan, binskim, antimalwareScan, psscriptanalyzer, eslint, roslyn, bandit, prefast
enabled: false
justificationForDisabling: "Waiting on updated dotnet/arcade so psscriptanalyzer doesn't fail on dependent files."

stages:
- stage: build
Expand All @@ -80,8 +78,8 @@ extends:
- job: Windows_NT
pool:
# TODO: Can we use latest or equivalent?
name: NetCore1ESPool-Internal
demands: ImageOverride -equals windows.vs2022.amd64
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals 1es-windows-2022-pt
os: windows
templateContext:
# This enables SDL scanning to be run once across all artifacts
Expand Down Expand Up @@ -198,8 +196,9 @@ extends:
jobs:
- job: Linux
pool:
vmImage: ubuntu-20.04
name: $(DncEngInternalBuildPool)
os: linux
demands: ImageOverride -equals 1es-mariner-2-pt
templateContext:
# This enables SDL scanning to be run once across all artifacts
outputParentDirectory: $(Build.SourcesDirectory)/artifacts
Expand Down