From 007adc66d69605de82b6fd7274f0f011c2fb00c2 Mon Sep 17 00:00:00 2001
From: scbedd <45376673+scbedd@users.noreply.github.com>
Date: Mon, 13 Jan 2020 11:19:17 -0800
Subject: [PATCH] remove parallel spinner for tox logs. allow eventhub to run
 in serial

---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml   | 3 ++-
 eng/pipelines/templates/stages/archetype-sdk-client.yml | 2 ++
 scripts/devops_tasks/tox_harness.py                     | 1 +
 sdk/eventhub/ci.yml                                     | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 45146a1b2b55..eece2bb7e79c 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -4,6 +4,7 @@ parameters:
   TestMarkArgument: ''
   BuildTargetingString: 'azure-*'
   TestTimeoutInMinutes: 0
+  ToxEnvParallel: '--tenvparallel'
   TestMatrix:
     Linux_Python27:
       OSName: 'Linux'
@@ -117,7 +118,7 @@ jobs:
         PythonVersion: $(PythonVersion)
         BuildTargetingString: ${{ parameters.BuildTargetingString }}
         ToxTestEnv: 'whl,sdist'
-        ToxEnvParallel: '--tenvparallel'
+        ToxEnvParallel: ${{ parameters.ToxEnvParallel }}
         BeforeTestSteps: 
           - task: DownloadPipelineArtifact@0
             inputs:
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index c3c7201c93c5..540ec4e7adc3 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -1,6 +1,7 @@
 parameters:
   Artifacts: []
   ServiceDirectory: not-specified
+  ToxEnvParallel: '--tenvparallel'
   
 stages:
   - stage: Build
@@ -8,6 +9,7 @@ stages:
     - template: ../jobs/archetype-sdk-client.yml
       parameters:
         ServiceDirectory: ${{parameters.ServiceDirectory}}
+        ToxEnvParallel: ${{parameters.ToxEnvParallel}}
 
   # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
   - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
diff --git a/scripts/devops_tasks/tox_harness.py b/scripts/devops_tasks/tox_harness.py
index b1e728a3b58d..8a7c7761c0e7 100644
--- a/scripts/devops_tasks/tox_harness.py
+++ b/scripts/devops_tasks/tox_harness.py
@@ -282,6 +282,7 @@ def prep_and_run_tox(targeted_packages, parsed_args, options_array=[]):
 
         if in_ci():
             replace_dev_reqs(destination_dev_req)
+            os.environ["TOX_PARALLEL_NO_SPINNER"] = "1"
 
         if parsed_args.tox_env:
             tox_execution_array.extend(["-e", parsed_args.tox_env])
diff --git a/sdk/eventhub/ci.yml b/sdk/eventhub/ci.yml
index d04759a7cea4..8b06e2efe9e8 100644
--- a/sdk/eventhub/ci.yml
+++ b/sdk/eventhub/ci.yml
@@ -41,6 +41,7 @@ stages:
 - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: eventhub
+    ToxEnvParallel: ' '
     Artifacts:
     - name: azure_eventhub
       safeName: azureeventhub