From 829717f5deabf5b41f9aee33619a8b54fbe6491b Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Thu, 12 Dec 2019 15:33:55 -0800
Subject: [PATCH] move the step for publishing integration test results (#8658)

---
 .../win32/sql-product-build-win32.yml                | 12 +-----------
 .../azure-pipelines/win32/sql-product-test-win32.yml | 10 ++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml
index 732299b0f9..5174a15e81 100644
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -260,17 +260,7 @@ steps:
       searchFolder: '$(Build.SourcesDirectory)'
       failTaskOnFailedTests: true
     continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-
-  - task: PublishTestResults@2
-    displayName: 'Publish Integration and Smoke Test Results'
-    inputs:
-      testResultsFiles: '*.xml'
-      searchFolder: '$(Build.ArtifactStagingDirectory)\test-results'
-      mergeTestResults: true
-      failTaskOnFailedTests: true
-    continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeeded(), eq(variables['RUN_UNSTABLE_TESTS'], 'true'))
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
diff --git a/build/azure-pipelines/win32/sql-product-test-win32.yml b/build/azure-pipelines/win32/sql-product-test-win32.yml
index 2cd32eb5e6..f179d62e18 100644
--- a/build/azure-pipelines/win32/sql-product-test-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-test-win32.yml
@@ -104,3 +104,13 @@ steps:
     AZURE_SQL_USERNAME: $(ads-integration-test-azure-server-username)
     AZURE_SQL_PWD: $(ads-integration-test-azure-server-password)
     AZURE_SQL: $(ads-integration-test-azure-server)
+
+- task: PublishTestResults@2
+  displayName: 'Publish Integration and Smoke Test Results'
+  inputs:
+    testResultsFiles: '*.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)\test-results'
+    mergeTestResults: true
+    failTaskOnFailedTests: true
+  continueOnError: true
+  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))