From e022c3d4aaeb38871ef6df3b347dac7098a7d52d Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 28 Aug 2026 20:37:22 +0530 Subject: [PATCH 1/2] Temporarily skip RS5 test execution Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 608586e2-f0b2-44c5-9a5a-a05b11506dfd --- .../AzurePipelinesTemplates/WinUI-RunScenarioTests-Stage.yml | 1 + .../WinUI-RunTestPassOnPipeline-Job.yml | 3 ++- build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml | 3 ++- build/WinUI-GitHub-PR.yml | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/AzurePipelinesTemplates/WinUI-RunScenarioTests-Stage.yml b/build/AzurePipelinesTemplates/WinUI-RunScenarioTests-Stage.yml index 120f2f778d..104caaf8f2 100644 --- a/build/AzurePipelinesTemplates/WinUI-RunScenarioTests-Stage.yml +++ b/build/AzurePipelinesTemplates/WinUI-RunScenarioTests-Stage.yml @@ -30,6 +30,7 @@ stages: buildConfiguration: chk testOS: Win10-RS5 testPayloadArtifactName: 'ScenarioTestPayload' + skipTests: true - template: WinUI-RunTestPassOnPipeline-Job.yml parameters: diff --git a/build/AzurePipelinesTemplates/WinUI-RunTestPassOnPipeline-Job.yml b/build/AzurePipelinesTemplates/WinUI-RunTestPassOnPipeline-Job.yml index e6a48ce0f1..34dbf02521 100644 --- a/build/AzurePipelinesTemplates/WinUI-RunTestPassOnPipeline-Job.yml +++ b/build/AzurePipelinesTemplates/WinUI-RunTestPassOnPipeline-Job.yml @@ -11,6 +11,7 @@ parameters: rerunPassesRequiredToAvoidFailure: 5 testPayloadArtifactName: 'TestPayload' failOnTestFailure: true + skipTests: false # We run the bulk of our tests in Helix. But this Job runs tests directly on the Pipeline agents. # These Pipeline agents are running on a ni_release build of Windows which is not available in Helix. # This approach allows us to run tests on prerelease builds of Windows. @@ -18,7 +19,7 @@ parameters: jobs: - job: ${{ parameters.runTestJobName }} #${{ parameters.testOS }}${{ parameters.buildPlatform }}${{ parameters.buildConfiguration }} dependsOn: ${{ parameters.dependsOn }} - condition: not(failed()) + condition: and(not(failed()), eq(${{ parameters.skipTests }}, false)) pool: type: windows isCustom: true diff --git a/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml b/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml index cfaf64fa48..c022be36a8 100644 --- a/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml +++ b/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml @@ -40,4 +40,5 @@ stages: dependsOn: CreateTestPayload testOS: 'Win10-RS5' testPayloadArtifactName: 'TestPayload' - failOnTestFailure: ${{ parameters.failOnTestFailure }} \ No newline at end of file + failOnTestFailure: ${{ parameters.failOnTestFailure }} + skipTests: true \ No newline at end of file diff --git a/build/WinUI-GitHub-PR.yml b/build/WinUI-GitHub-PR.yml index a34c066768..0797a15c66 100644 --- a/build/WinUI-GitHub-PR.yml +++ b/build/WinUI-GitHub-PR.yml @@ -169,7 +169,7 @@ extends: dependsOn: ValidateGitHubPrContext - ${{ if eq(parameters.runFullValidation, true) }}: - - template: build\AzurePipelinesTemplates\WinUI-RunTests-Stage.yml@WinUIInternal + - template: build\AzurePipelinesTemplates\WinUI-RunTests-Stage.yml parameters: pipelineKind: PR # Test results are published but do not gate the pipeline yet. @@ -181,7 +181,7 @@ extends: MUXFinalRelease: ${{ parameters.MUXFinalRelease }} - ${{ if eq(parameters.runFullValidation, true) }}: - - template: build\AzurePipelinesTemplates\WinUI-RunScenarioTests-Stage.yml@WinUIInternal + - template: build\AzurePipelinesTemplates\WinUI-RunScenarioTests-Stage.yml parameters: pipelineKind: GitHubPR dependsOn: Build From e4a336f1307b3d68962921338734100af0c89442 Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 28 Aug 2026 20:41:43 +0530 Subject: [PATCH 2/2] Keep RS5 skip diff focused Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 608586e2-f0b2-44c5-9a5a-a05b11506dfd --- build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml b/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml index c022be36a8..ec2eb5f3d2 100644 --- a/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml +++ b/build/AzurePipelinesTemplates/WinUI-RunTests-Stage.yml @@ -40,5 +40,5 @@ stages: dependsOn: CreateTestPayload testOS: 'Win10-RS5' testPayloadArtifactName: 'TestPayload' - failOnTestFailure: ${{ parameters.failOnTestFailure }} - skipTests: true \ No newline at end of file + skipTests: true + failOnTestFailure: ${{ parameters.failOnTestFailure }} \ No newline at end of file