starting the reorganize to allow livetesting of fresh wheels

scbedd · scbedd · commit 7a3329ddcddb · 2019-08-19T17:25:38.000-07:00
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -135,7 +135,12 @@ jobs:
           OSName: $(OSName)
           PythonVersion: $(PythonVersion)
           BuildTargetingString: ${{ parameters.BuildTargetingString }}
-
+          BeforeTestSteps: 
+              - task: DownloadPipelineArtifact@0
+                inputs:
+                  artifactName: 'artifacts' 
+                  targetPath: $(Build.ArtifactStagingDirectory)
+                  
       - template: ../steps/publish-coverage.yml
 
   # Run PyPy tests without coverage
@@ -159,9 +164,14 @@ jobs:
     steps:
       - template: ../steps/build-test.yml
         parameters:
-          AdditionalTestArgs: '--disablecov'
+          AdditionalTestArgs: '--disablecov --wheel_dir="$(Build.ArtifactStagingDirectory)"'
           ServiceDirectory: ${{ parameters.ServiceDirectory }}
           TestMarkArgument: ${{ parameters.TestMarkArgument }}
           OSName: $(OSName)
           PythonVersion: $(PythonVersion)
           BuildTargetingString: ${{ parameters.BuildTargetingString }}
+          BeforeTestSteps: 
+              - task: DownloadPipelineArtifact@0
+                inputs:
+                  artifactName: 'artifacts' 
+                  targetPath: $(Build.ArtifactStagingDirectory)
diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
@@ -10,11 +10,6 @@ parameters:
   RunMyPy: and(ne(variables['PythonVersion'], '2.7'), ne(variables['PythonVersion'], 'pypy3'))
 
 steps:
-  - task: DownloadPipelineArtifact@0
-    inputs:
-      artifactName: 'artifacts' 
-      targetPath: $(Build.ArtifactStagingDirectory)
-
   - powershell: |
       gci -r $(Build.ArtifactStagingDirectory)
 
@@ -51,7 +46,7 @@ steps:
         --mark_arg="${{ parameters.TestMarkArgument }}" 
         --service="${{ parameters.ServiceDirectory }}" 
         --toxenv="" 
-        --wheel_dir="$(Build.ArtifactStagingDirectory)" 
+
         --tparallel
     env: ${{ parameters.EnvVars }}
 
@@ -65,7 +60,6 @@ steps:
         --mark_arg="${{ parameters.TestMarkArgument }}" 
         --service="${{ parameters.ServiceDirectory }}" 
         --toxenv="lint"
-        --wheel_dir="$(Build.ArtifactStagingDirectory)"
     env: ${{ parameters.EnvVars }}
 
   - task: PythonScript@0
@@ -78,7 +72,6 @@ steps:
         --mark_arg="${{ parameters.TestMarkArgument }}" 
         --service="${{ parameters.ServiceDirectory }}" 
         --toxenv="mypy"
-        --wheel_dir="$(Build.ArtifactStagingDirectory)"
     env: ${{ parameters.EnvVars }}
     condition: and(succeededOrFailed(), ${{ parameters.RunMyPy }})
 
