Skip to content

Use python venv for SPMI collection / jit rolling build #95714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 9, 2023
Merged

Use python venv for SPMI collection / jit rolling build #95714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e6e818
Use python venv for SPMI collection on linux
AndyAyersMS Dec 5, 2023
3e58b92
include windows
AndyAyersMS Dec 7, 2023
c1db80f
invoke pip via python on windows
AndyAyersMS Dec 7, 2023
5d9ae2d
fix jit build too; review feedback
AndyAyersMS Dec 8, 2023
22cdccf
no --user install with venv
AndyAyersMS Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions eng/pipelines/coreclr/templates/build-jit-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,19 @@ jobs:
value: ''

- ${{ if eq(parameters.osGroup, 'windows') }}:
- name: PythonSetupScript
value: 'py -3 -m venv $(Build.SourcesDirectory)\venv'
- name: PythonScript
value: 'py -3'
value: '$(Build.SourcesDirectory)\venv\Scripts\python.exe'
- name: PipScript
value: 'py -3 -m pip'
value: '$(Build.SourcesDirectory)\venv\Scripts\python.exe -m pip'
- ${{ if ne(parameters.osGroup, 'windows') }}:
- name: PythonSetupScript
value: 'python3 -m venv $(Build.SourcesDirectory)/venv'
- name: PythonScript
value: 'python3'
value: '$(Build.SourcesDirectory)/venv/bin/python3'
- name: PipScript
value: 'pip3'
value: '$(Build.SourcesDirectory)/venv/bin/pip3'

- ${{ parameters.variables }}

Expand Down Expand Up @@ -106,8 +110,11 @@ jobs:
artifactFeeds: public/dotnet-public-pypi
onlyAddExtraIndex: false

- script: $(PythonSetupScript)
displayName: Enable python venv

# Ensure the Python azure-storage-blob package is installed before doing the upload.
- script: $(PipScript) install --user --upgrade pip && $(PipScript) install --user azure.storage.blob==12.5.0 --force-reinstall
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall
displayName: Upgrade Pip to latest and install azure-storage-blob Python package

- script: $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/jitrollingbuild.py upload -build_type $(buildConfig) -arch $(archType) -host_os $(osGroup) -git_hash $(Build.SourceVersion) --use_latest_jit_change
Expand Down
17 changes: 12 additions & 5 deletions eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ jobs:
- CollectionName: ${{ parameters.collectionName }}

- ${{ if eq(parameters.osGroup, 'windows') }}:
- name: PythonSetupScript
value: 'py -3 -m venv $(Build.SourcesDirectory)\venv'
- name: PythonScript
value: 'py -3'
value: '$(Build.SourcesDirectory)\venv\Scripts\python.exe'
- name: PipScript
value: 'py -3 -m pip'
value: '$(Build.SourcesDirectory)\venv\Scripts\python.exe -m pip'
- name: Core_Root_Dir
value: '$(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.${{ parameters.buildConfig }}\Tests\Core_Root'
- name: MchFilesLocation
Expand All @@ -70,10 +72,12 @@ jobs:
- name: PayloadLocation
value: '$(Build.SourcesDirectory)\payload'
- ${{ if ne(parameters.osGroup, 'windows') }}:
- name: PythonSetupScript
value: 'python3 -m venv $(Build.SourcesDirectory)/venv'
- name: PythonScript
value: 'python3'
value: '$(Build.SourcesDirectory)/venv/bin/python3'
- name: PipScript
value: 'pip3'
value: '$(Build.SourcesDirectory)/venv/bin/pip3'
- name: Core_Root_Dir
value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr/${{ parameters.osGroup }}.${{ parameters.archType }}.$(buildConfigUpper)/Tests/Core_Root'
- name: MchFilesLocation
Expand Down Expand Up @@ -112,6 +116,9 @@ jobs:
steps:
- ${{ parameters.steps }}

- script: $(PythonSetupScript)
displayName: Enable python venv

- script: $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi_collect_setup.py -payload_directory $(PayloadLocation) -source_directory $(Build.SourcesDirectory) -core_root_directory $(Core_Root_Dir) -arch $(archType) -platform $(osGroup) -mch_file_tag $(MchFileTag) -input_directory $(InputDirectory) -collection_name $(CollectionName) -collection_type $(CollectionType) -max_size 25 # size in MB
displayName: ${{ format('SuperPMI setup ({0})', parameters.osGroup) }}

Expand Down Expand Up @@ -173,7 +180,7 @@ jobs:
onlyAddExtraIndex: false

# Ensure the Python azure-storage-blob package is installed before doing the upload.
- script: $(PipScript) install --user --upgrade pip && $(PipScript) install --user azure.storage.blob==12.5.0 --force-reinstall
- script: $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall
displayName: Upgrade Pip to latest and install azure-storage-blob Python package

- script: $(PythonScript) $(Build.SourcesDirectory)/src/coreclr/scripts/superpmi.py upload -log_level DEBUG -arch $(archType) -build_type $(buildConfig) -mch_files $(MergedMchFileLocation)$(CollectionName).$(CollectionType).$(MchFileTag).mch -core_root $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).x64.$(buildConfigUpper)
Expand Down