@@ -55,10 +55,12 @@ jobs:
55
55
- CollectionName : ${{ parameters.collectionName }}
56
56
57
57
- ${{ if eq(parameters.osGroup, 'windows') }} :
58
+ - name : PythonSetupScript
59
+ value : ' py -3 -m venv $(Build.SourcesDirectory)\venv'
58
60
- name : PythonScript
59
- value : ' py -3 '
61
+ value : ' $(Build.SourcesDirectory)\venv\Scripts\python.exe '
60
62
- name : PipScript
61
- value : ' py -3 -m pip'
63
+ value : ' $(Build.SourcesDirectory)\venv\Scripts\python.exe -m pip'
62
64
- name : Core_Root_Dir
63
65
value : ' $(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.${{ parameters.buildConfig }}\Tests\Core_Root'
64
66
- name : MchFilesLocation
@@ -70,10 +72,12 @@ jobs:
70
72
- name : PayloadLocation
71
73
value : ' $(Build.SourcesDirectory)\payload'
72
74
- ${{ if ne(parameters.osGroup, 'windows') }} :
75
+ - name : PythonSetupScript
76
+ value : ' python3 -m venv $(Build.SourcesDirectory)/venv'
73
77
- name : PythonScript
74
- value : ' python3'
78
+ value : ' $(Build.SourcesDirectory)/venv/bin/ python3'
75
79
- name : PipScript
76
- value : ' pip3'
80
+ value : ' $(Build.SourcesDirectory)/venv/bin/ pip3'
77
81
- name : Core_Root_Dir
78
82
value : ' $(Build.SourcesDirectory)/artifacts/tests/coreclr/${{ parameters.osGroup }}.${{ parameters.archType }}.$(buildConfigUpper)/Tests/Core_Root'
79
83
- name : MchFilesLocation
@@ -112,6 +116,9 @@ jobs:
112
116
steps :
113
117
- ${{ parameters.steps }}
114
118
119
+ - script : $(PythonSetupScript)
120
+ displayName : Enable python venv
121
+
115
122
- 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
116
123
displayName : ${{ format('SuperPMI setup ({0})', parameters.osGroup) }}
117
124
@@ -173,7 +180,7 @@ jobs:
173
180
onlyAddExtraIndex : false
174
181
175
182
# Ensure the Python azure-storage-blob package is installed before doing the upload.
176
- - script : $(PipScript) install --user -- upgrade pip && $(PipScript) install --user azure.storage.blob==12.5.0 --force-reinstall
183
+ - script : $(PipScript) install --upgrade pip && $(PipScript) install azure.storage.blob==12.5.0 --force-reinstall
177
184
displayName : Upgrade Pip to latest and install azure-storage-blob Python package
178
185
179
186
- 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)
0 commit comments