use parameter for BuildTargetingString (Azure#5932)

danieljurek · web-flow · commit 92e0e1329708 · 2019-06-18T13:20:55.000-08:00
* use parameter for BuildTargetingString
* add BuildTargetingString to build-test.yml
* ensure BuildTargetingString is in all steps
diff --git a/eng/pipelines/client.yml b/eng/pipelines/client.yml
@@ -12,6 +12,7 @@ jobs:
     parameters:
       ServiceDirectory: ''
       TestMarkArgument: $(TestMarkArgument)
+      BuildTargetingString: $(BuildTargetingString)
       BeforeBuildJobPublishBuildArtifacts:
         - script: 'echo "##vso[build.addbuildtag]$(ReleaseTag)"'
           displayName: 'Tag The Build'
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -2,6 +2,7 @@ parameters:
   ServiceDirectory: ''
   BeforeBuildJobPublishBuildArtifacts: []
   TestMarkArgument: ''
+  BuildTargetingString: 'azure-*'
 
 jobs:
   - job: 'Build'
@@ -25,7 +26,7 @@ jobs:
         displayName: 'Generate Packages'
         inputs:
           scriptPath: 'scripts/devops_tasks/build_packages.py'
-          arguments: '-d "$(Build.ArtifactStagingDirectory)" "azure-*" --service=${{parameters.ServiceDirectory}}'
+          arguments: '-d "$(Build.ArtifactStagingDirectory)" "${{ parameters.BuildTargetingString }}" --service=${{parameters.ServiceDirectory}}'
 
       - script: |
           twine check $(Build.ArtifactStagingDirectory)/*
@@ -127,6 +128,7 @@ jobs:
           TestMarkArgument: ${{ parameters.TestMarkArgument }}
           OSName: $(OSName)
           PythonVersion: $(PythonVersion)
+          BuildTargetingString: ${{ parameters.BuildTargetingString }}
 
       - template: ../steps/publish-coverage.yml
 
@@ -157,3 +159,4 @@ jobs:
           TestMarkArgument: ${{ parameters.TestMarkArgument }}
           OSName: $(OSName)
           PythonVersion: $(PythonVersion)
+          BuildTargetingString: ${{ parameters.BuildTargetingString }}
diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
@@ -6,6 +6,8 @@ parameters:
   PythonVersion: ''
   OSName: ''
   BeforeTestSteps: []
+  BuildTargetingString: 'azure-*'
+
 
 steps:
   - powershell: |
@@ -35,7 +37,7 @@ steps:
     displayName: 'Setup and Run Tests'
     inputs:
       scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
-      arguments: '"azure-*" --junitxml="junit/test-results.xml" ${{ parameters.AdditionalTestArgs }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}"'
+      arguments: '"${{ parameters.BuildTargetingString }}" --junitxml="junit/test-results.xml" ${{ parameters.AdditionalTestArgs }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}"'
     env: ${{ parameters.EnvVars }}
 
   - task: PublishTestResults@2
