Revert "Stop running template tests on azdo job (already helix-ified) (…

…#32985)" This reverts commit 7a842b7.
dotnet · Jul 11, 2021 · 62fbc87 · 62fbc87
1 parent 2136f31
commit 62fbc87
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -673,6 +673,35 @@ stages:
           publishOnError: true
           includeForks: true
 
+    - template: jobs/default-build.yml
+      parameters:
+        condition: ne(variables['SkipTests'], 'true')
+        jobName: Windows_Templates_Test
+        jobDisplayName: "Test: Templates - Windows Server 2016 x64"
+        agentOs: Windows
+        isTestingJob: true
+        testRunTitle: Templates-$(AgentOsName)-$(BuildConfiguration)
+        steps:
+        - script: ./eng/build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
+          displayName: Build Repo
+        - script: ./src/ProjectTemplates/build.cmd -ci -nobl -noBuildRepoTasks -pack -NoRestore -noBuildNative -NoBuilddeps "/p:RunTemplateTests=true"
+          displayName: Pack Templates
+        - script: ./src/ProjectTemplates/build.cmd -ci -nobl -noBuildRepoTasks -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
+          displayName: Test Templates
+        artifacts:
+        - name: Windows_Test_Templates_Dumps
+          path: artifacts/dumps/
+          publishOnError: true
+          includeForks: true
+        - name: Windows_Test_Templates_Logs
+          path: artifacts/log/
+          publishOnError: true
+          includeForks: true
+        - name: Windows_Test_Templates_Results
+          path: artifacts/TestResults/
+          publishOnError: true
+          includeForks: true
+
     - template: jobs/default-build.yml
       parameters:
         condition: ne(variables['SkipTests'], 'true')

diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
@@ -86,7 +86,10 @@ jobs:
     steps:
     - powershell: "& ./eng/build.ps1 -CI -nobl -all -pack -NoBuildJava"
       displayName: Build
-    - script: ./eng/build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunQuarantinedTests=true /p:SkipHelixReadyTests=true"
+    # The templates part can be removed when the Blazor Templates run on Helix
+    - script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuildNative -NoBuilddeps "/p:RunTemplateTests=true"
+      displayName: Pack Templates
+    - script: ./eng/build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /p:RunQuarantinedTests=true /p:SkipHelixReadyTests=true"
       displayName: Run Quarantined Tests
       continueOnError: true
     - task: PublishTestResults@2