Skip to content

Commit 67aa17f

Browse files
authored
Use Common Matrix Generation (Azure#38324)
* convert python to using common matrix generation present in eng/common generate-matrix yml
1 parent cd22b6e commit 67aa17f

File tree

6 files changed

+26
-95
lines changed

6 files changed

+26
-95
lines changed

eng/pipelines/templates/jobs/ci.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -244,20 +244,26 @@ jobs:
244244
MatrixConfigs: ${{ parameters.MatrixConfigs }}
245245
MatrixFilters: ${{ parameters.MatrixFilters }}
246246
MatrixReplace: ${{ parameters.MatrixReplace }}
247-
PreGenerationSteps:
248-
249-
- template: /eng/pipelines/templates/steps/download-package-artifacts.yml
250-
251-
- task: Powershell@2
252-
inputs:
253-
pwsh: true
254-
filePath: eng/scripts/distribute-packages-to-matrix.ps1
255-
arguments: >-
256-
-PackageInfoFolder "$(Build.ArtifactStagingDirectory)/PackageInfo"
257-
-PlatformMatrix "${{ parameters.MatrixConfigs[0].Path }}"
258-
displayName: 'Distribute Packages to Matrix'
259-
condition: and(eq(variables['Build.Reason'], 'PullRequest'), eq('${{ parameters.ServiceDirectory }}','auto'))
260-
247+
${{ if eq(parameters.ServiceDirectory, 'auto') }}:
248+
SparseCheckoutPaths:
249+
- "**/setup.py"
250+
- "**/pyproject.toml"
251+
- "tools/"
252+
- "**/ci*.yml"
253+
- "**/_version.py"
254+
- "**/version.py"
255+
- "**/README.md"
256+
- "**/CHANGELOG.md"
257+
- "**/*matrix*.json"
258+
EnablePRGeneration: true
259+
PRMatrixSetting: "TargetingString"
260+
PreGenerationSteps:
261+
- task: UsePythonVersion@0
262+
inputs:
263+
versionSpec: '3.12'
264+
- template: /eng/common/pipelines/templates/steps/save-package-properties.yml
265+
parameters:
266+
ServiceDirectory: ${{parameters.ServiceDirectory}}
261267
CloudConfig:
262268
Cloud: Public
263269
AdditionalParameters:

eng/pipelines/templates/steps/build-package-artifacts.yml

Lines changed: 3 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -59,57 +59,9 @@ steps:
5959
parameters:
6060
ServiceDirectory: ${{ parameters.ServiceDirectory }}
6161

62-
# now we need to call Save-Package-Properties so that we can filter on it
63-
- ${{ if and(eq(variables['Build.Reason'], 'PullRequest'), eq(parameters.ServiceDirectory, 'auto')) }}:
64-
- pwsh: |
65-
mkdir -p $(Build.ArtifactStagingDirectory)/diff
66-
displayName: Create PR Diff Folder
67-
68-
- pwsh: |
69-
$location = Join-Path "$(Build.ArtifactStagingDirectory)" "diff"
70-
71-
Write-Host "./eng/common/scripts/Generate-PR-Diff.ps1 -TargetPath `"$(Build.SourcesDirectory)`" -ArtifactPath `"$location`""
72-
./eng/common/scripts/Generate-PR-Diff.ps1 -TargetPath "$(Build.SourcesDirectory)" -ArtifactPath "$location"
73-
displayName: Generate PR Diff
74-
75-
- pwsh: |
76-
Write-Host "We freshly generated the PR diff, and this is what it sees!"
77-
Get-ChildItem -R -Force $(Build.ArtifactStagingDirectory)/diff | % { $_.FullName }
78-
cat $(Build.ArtifactStagingDirectory)/diff/diff.json
79-
displayName: Dump PR Diff
80-
81-
- task: Powershell@2
82-
inputs:
83-
filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
84-
arguments: >
85-
-PrDiff $(Build.ArtifactStagingDirectory)/diff/diff.json
86-
-OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
87-
pwsh: true
88-
workingDirectory: $(Pipeline.Workspace)
89-
displayName: Save package properties filtered for PR
90-
91-
- ${{ else }}:
92-
- task: Powershell@2
93-
condition: and(succeeded(), eq(variables['SetDevVersion'],'true'))
94-
inputs:
95-
filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
96-
arguments: >
97-
-ServiceDirectory ${{parameters.ServiceDirectory}}
98-
-OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
99-
-AddDevVersion
100-
pwsh: true
101-
workingDirectory: $(Pipeline.Workspace)
102-
displayName: Save package properties with dev version
103-
- task: Powershell@2
104-
condition: and(succeeded(), ne(variables['SetDevVersion'],'true'))
105-
inputs:
106-
filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
107-
arguments: >
108-
-ServiceDirectory ${{parameters.ServiceDirectory}}
109-
-OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
110-
pwsh: true
111-
workingDirectory: $(Pipeline.Workspace)
112-
displayName: Save package properties for service
62+
- template: /eng/common/pipelines/templates/steps/save-package-properties.yml
63+
parameters:
64+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
11365

11466
- template: /eng/pipelines/templates/steps/resolve-package-targeting.yml
11567
parameters:
@@ -136,18 +88,6 @@ steps:
13688
displayName: 'Prep Environment'
13789
condition: and(succeeded(), or(eq(variables['ENABLE_EXTENSION_BUILD'], 'true'), eq('${{ parameters.ArtifactSuffix }}', 'linux')))
13890
139-
- task: Powershell@2
140-
inputs:
141-
filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
142-
arguments: >
143-
-ServiceDirectory ${{parameters.ServiceDirectory}}
144-
-OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
145-
-AddDevVersion
146-
pwsh: true
147-
workingDirectory: $(Pipeline.Workspace)
148-
displayName: Update package properties with dev version
149-
condition: and(succeeded(), eq(variables['SetDevVersion'],'true'), or(eq(variables['ENABLE_EXTENSION_BUILD'], 'true'), eq('${{ parameters.ArtifactSuffix }}', 'linux')))
150-
15191
- script: |
15292
sudo apt-get update
15393
sudo apt-get install -y qemu-user-static

sdk/attestation/ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ extends:
2828
parameters:
2929
ServiceDirectory: attestation
3030
TestProxy: true
31-
# Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837
32-
MatrixConfigs:
33-
- Name: attestation_ci_matrix
34-
Path: eng/pipelines/templates/stages/platform-matrix.json
35-
Selection: sparse
36-
GenerateVMJobs: true
3731
Artifacts:
3832
- name: azure-mgmt-attestation
3933
safeName: azuremgmtattestation

sdk/evaluation/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ extends:
3030
TestProxy: true
3131
# This custom matrix config should be dropped once:
3232
# * Once azure-ai-ml supports 3.13 (currently crashes due to type annotation)
33-
MatrixConfigs:
34-
- Name: evaluation_ci_matrix
35-
Path: eng/pipelines/templates/stages/platform-matrix-no-313.json
36-
Selection: sparse
37-
GenerateVMJobs: true
33+
MatrixFilters:
34+
- PythonVersion=^(?!3\.13)
3835
Artifacts:
3936
- name: azure-ai-evaluation
4037
safeName: azureaievaluation

sdk/identity/azure-identity/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

sdk/keyvault/ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ extends:
3131
parameters:
3232
ServiceDirectory: keyvault
3333
TestProxy: true
34-
# Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837
35-
MatrixConfigs:
36-
- Name: keyvault_ci_matrix
37-
Path: eng/pipelines/templates/stages/platform-matrix.json
38-
Selection: sparse
39-
GenerateVMJobs: true
4034
Artifacts:
4135
- name: azure-keyvault-administration
4236
safename: azurekeyvaultadministration

0 commit comments

Comments
 (0)