From a4f2eb67ef1894fd0ec3d4831b8afc54dc21aefc Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh <SINGHASHISH@MICROSOFT.COM>
Date: Thu, 16 Feb 2023 13:55:14 +0530
Subject: [PATCH] WPF Test Automation (#7541)

* Run feature suites on demand

* include main for PR trigger
---
 azure-pipelines1.yml      |  4 +--
 eng/wpfautomatedtests.yml | 58 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines1.yml b/azure-pipelines1.yml
index 65db7dff9..443cfd104 100644
--- a/azure-pipelines1.yml
+++ b/azure-pipelines1.yml
@@ -45,6 +45,7 @@ trigger:
     - internal/release/6.*
     - experimental/*
     - ctp
+    - feature/*
   paths:
     exclude:
     - Documentation/*
@@ -53,8 +54,7 @@ pr:
   autoCancel: true
   branches:
     include:
-    - drttesting
-    - ctp
+    - main
   paths:
     exclude:
     - Documentation/*
diff --git a/eng/wpfautomatedtests.yml b/eng/wpfautomatedtests.yml
index 912e468e6..de5767d56 100644
--- a/eng/wpfautomatedtests.yml
+++ b/eng/wpfautomatedtests.yml
@@ -236,15 +236,67 @@ jobs:
           targetType: 'inline'
           script: '.\RunDrts.cmd'
           workingDirectory: '$(System.ArtifactsDirectory)\testbins'
-        condition: ne(variables['_Platform'], 'arm64')
         continueOnError: true
 
-
       - task: PowerShell@2
         displayName: Run Microsuites
         inputs:
           targetType: 'inline'
           script: '.\RunTests.cmd /Keywords=Microsuite'
           workingDirectory: '$(System.ArtifactsDirectory)\testbins'
-        condition: ne(variables['_Platform'], 'arm64')
         continueOnError: true
+
+      - task: PowerShell@2
+        displayName: Run Feature Suites
+        inputs:
+          targetType: 'inline'
+          script: '.\RunTests.cmd /Area=$(areas)'
+          workingDirectory: '$(System.ArtifactsDirectory)\testbins'
+        continueOnError: true
+        condition: ne(variables['areas'], '')
+
+      - task: PowerShell@2
+        displayName: Run Full Suites
+        inputs:
+          targetType: 'inline'
+          script: '.\RunTests.cmd'
+          workingDirectory: '$(System.ArtifactsDirectory)\testbins'
+        continueOnError: true
+        condition: eq(variables['fulltest'], 'fulltest')
+
+      - task: CopyFiles@2
+        inputs:
+          SourceFolder: 'C:\Users\cloudtest\AppData\Roaming\QualityVault\Run\Report\'
+          Contents: '**'
+          TargetFolder: '$(System.DefaultWorkingDirectory)\Results\'
+          CleanTargetFolder: true
+          OverWrite: true
+        condition: eq(variables['_Platform'], 'x64')
+        
+      - task: CopyFiles@2
+        inputs:
+          SourceFolder: 'C:\Users\cloudtest\AppData\Roaming\QualityVault\Run\Report\'
+          Contents: '**'
+          TargetFolder: '$(System.DefaultWorkingDirectory)\ResultsX86\'
+          CleanTargetFolder: true
+          OverWrite: true
+        condition: eq(variables['_Platform'], 'x86')
+
+      - task: PublishPipelineArtifact@1
+        inputs:
+          artifactName: 'TestResultsX64'
+          targetPath: '$(System.DefaultWorkingDirectory)\Results\'      
+        condition: eq(variables['_Platform'], 'x64')
+
+      - task: PublishPipelineArtifact@1
+        inputs:
+          artifactName: 'TestResultsX86'
+          targetPath: '$(System.DefaultWorkingDirectory)\ResultsX86\'
+        condition: eq(variables['_Platform'], 'x86')
+          
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: 'XUnit'
+          testResultsFiles: 'testResults.xml'
+          searchFolder: '$(System.DefaultWorkingDirectory)\Results\'
+          testRunTitle: 'CTP results'
\ No newline at end of file