From 1beaa322ac45d94636b3af02813cdfd20056fa6c Mon Sep 17 00:00:00 2001
From: Scott Beddall <scbedd@microsoft.com>
Date: Tue, 23 Jun 2020 15:42:39 -0700
Subject: [PATCH] Revert "Resolve Pip Related Errors (#12157)"

This reverts commit c5ca969e5ffa4dbd5d91dfa646fb3fc29b29adc2.
---
 eng/ci_tools.txt                             |  2 +-
 eng/pipelines/templates/steps/build-test.yml | 32 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/eng/ci_tools.txt b/eng/ci_tools.txt
index 6b7348e9adca..92d6682453e1 100644
--- a/eng/ci_tools.txt
+++ b/eng/ci_tools.txt
@@ -1,7 +1,6 @@
 # requirements leveraged by ci tools
 setuptools==44.1.0; python_version == '2.7'
 setuptools==45.1.0; python_version >= '3.5'
-virtualenv==20.0.24
 wheel==0.34.2 
 Jinja2==2.11.1
 packaging==20.4
@@ -33,3 +32,4 @@ pytest-cov==2.8.1
 ./tools/azure-sdk-tools
 
 
+
diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
index 10aad24725d2..bc8451d96b5e 100644
--- a/eng/pipelines/templates/steps/build-test.yml
+++ b/eng/pipelines/templates/steps/build-test.yml
@@ -26,27 +26,27 @@ steps:
   - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
 
   - script: |
-      python -m pip install -r eng/ci_tools.txt
-      mkdir $(Build.SourcesDirectory)/env
-      python -m virtualenv $(Build.SourcesDirectory)/env 
+      python -m pip install pip == 20.1
+      pip install -r eng/ci_tools.txt
+      pip --version
     displayName: 'Prep Environment'
 
   - ${{ parameters.BeforeTestSteps }}
 
-  - pwsh: |
-      $env:Path = "$(Build.SourcesDirectory)/env;" + $env:Path
-      python -m pip install pip==20.1
-      python -m pip install -r eng/ci_tools.txt
-      python -m pip --version
-
-      $env:PYTHON_HOME = ""
-      $env:VIRTUAL_ENV = "$(Build.SourcesDirectory)/env"
-
-      Write-Host 'python ./scripts/devops_tasks/setup_execute_tests.py "${{ parameters.BuildTargetingString }}" ${{ parameters.AdditionalTestArgs }} ${{ parameters.CoverageArg }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}" --toxenv="${{ parameters.ToxTestEnv }}" --injected-packages="${{ parameters.InjectedPackages }}" ${{ parameters.ToxEnvParallel }}"'
-      python ./scripts/devops_tasks/setup_execute_tests.py "${{ parameters.BuildTargetingString }}" ${{ parameters.AdditionalTestArgs }} ${{ parameters.CoverageArg }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}" --toxenv="${{ parameters.ToxTestEnv }}" --injected-packages="${{ parameters.InjectedPackages }}" ${{ parameters.ToxEnvParallel }}
-      
-    env: ${{ parameters.EnvVars }}
+  - task: PythonScript@0
     displayName: 'Run Tests'
+    inputs:
+      scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
+      arguments: >-
+        "${{ parameters.BuildTargetingString }}"
+        ${{ parameters.AdditionalTestArgs }}
+        ${{ parameters.CoverageArg }}
+        --mark_arg="${{ parameters.TestMarkArgument }}"
+        --service="${{ parameters.ServiceDirectory }}"
+        --toxenv="${{ parameters.ToxTestEnv }}"
+        --injected-packages="${{ parameters.InjectedPackages }}"
+        ${{ parameters.ToxEnvParallel }}
+    env: ${{ parameters.EnvVars }}
 
   - ${{ parameters.AfterTestSteps }}