Skip to content

Commit

Permalink
[ci] Add 1ESPT override to MSBuild test stages (#8784)
Browse files Browse the repository at this point in the history
The mega pipeline extends our msbuild stages and does not yet support
using the 1ES pipeline template.
  • Loading branch information
pjcollins authored Mar 4, 2024
1 parent 5cd9a26 commit db49513
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build-tools/automation/yaml-templates/run-msbuild-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
repositoryAlias: 'self'
commit: ''
shouldFailOnIssue: true
use1ESTemplate: true

jobs:
- job: ${{ parameters.jobName }}
Expand Down Expand Up @@ -59,6 +60,7 @@ jobs:
parameters:
artifactName: Test Results - MSBuild - ${{ parameters.testOS }}-$(System.JobPositionInPhase)
xaSourcePath: ${{ parameters.xaSourcePath }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ parameters:
usesCleanImages: true
shouldFailOnIssue: true
emulatorStartContinueOnError: false
use1ESTemplate: true

stages:
- stage: ${{ parameters.stageName }}
Expand Down Expand Up @@ -70,6 +71,7 @@ stages:
parameters:
artifactName: Test Results - MSBuild With Emulator - macOS-$(System.JobPositionInPhase)
xaSourcePath: ${{ parameters.xaSourcePath }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
parameters:
Expand Down Expand Up @@ -141,6 +143,7 @@ stages:
configuration: $(XA.Build.Configuration)
artifactName: Test Results - Emulator $(avdApiLevel)-$(avdAbi)-$(avdType) - macOS
xaSourcePath: ${{ parameters.xaSourcePath }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ parameters:
repositoryAlias: 'self'
commit: ''
shouldFailOnIssue: true
use1ESTemplate: true

stages:
- stage: ${{ parameters.stageName }}
Expand All @@ -26,6 +27,7 @@ stages:
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
shouldFailOnIssue: ${{ parameters.shouldFailOnIssue }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml
parameters:
Expand All @@ -37,3 +39,4 @@ stages:
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
shouldFailOnIssue: ${{ parameters.shouldFailOnIssue }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}

0 comments on commit db49513

Please sign in to comment.