From 1bd2b5f19e7f6366ad5414d6cf19b538c9fb2b31 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 11 Feb 2020 14:29:02 -0800
Subject: [PATCH] [Helix] Only run flaky tests on quarantine runs (#18937)

* Only run flaky tests on quaratine run

* Only run flaky tests on quarantine run

* Rename to QUARANTINE

* Rename to QUARANTINE
---
 eng/helix/content/runtests.cmd | 3 ++-
 eng/helix/content/runtests.sh  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd
index 2e1f87878b..8fea9a3742 100644
--- a/eng/helix/content/runtests.cmd
+++ b/eng/helix/content/runtests.cmd
@@ -40,9 +40,10 @@ if not errorlevel 1 (
 set exit_code=0
 
 set NONQUARANTINE_FILTER="Flaky:All!=true&Flaky:Helix:All!=true&Flaky:Helix:Queue:All!=true&Flaky:Helix:Queue:%HELIX%!=true"
+set QUARANTINE_FILTER="Flaky:All=true|Flaky:Helix:All=true|Flaky:Helix:Queue:All=true|Flaky:Helix:Queue:%HELIX%=true"
 if (%quarantined%==true) (
     echo Running all tests.
-    %DOTNET_ROOT%\dotnet vstest %target% --logger:xunit
+    %DOTNET_ROOT%\dotnet vstest %target% --logger:xunit --TestCaseFilter:%QUARANTINE_FILTER%
     if errorlevel 1 (
         echo Failure in flaky test 1>&2
         REM DO NOT EXIT and DO NOT SET EXIT_CODE to 1
diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index cebc6fb543..51b596afa0 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -104,9 +104,10 @@ exit_code=0
 # only puts the explicit filter traits the user provided in the flaky attribute
 # Filter syntax: https://github.com/Microsoft/vstest-docs/blob/master/docs/filter.md
 NONQUARANTINE_FILTER="Flaky:All!=true&Flaky:Helix:All!=true&Flaky:Helix:Queue:All!=true&Flaky:Helix:Queue:$helix_queue_name!=true"
+QUARANTINE_FILTER="Flaky:All=true|Flaky:Helix:All=true|Flaky:Helix:Queue:All=true|Flaky:Helix:Queue:$helix_queue_name=true"
 if [ "$quarantined" == true ]; then
     echo "Running all tests including quarantined."
-    $DOTNET_ROOT/dotnet vstest $test_binary_path --logger:xunit
+    $DOTNET_ROOT/dotnet vstest $test_binary_path --logger:xunit --TestCaseFilter:"$QUARANTINE_FILTER"
     if [ $? != 0 ]; then
         echo "Quarantined tests failed!" 1>&2
         # DO NOT EXIT