Skip to content

Commit 54d4213

Browse files
authored
Target 3.11-rc.1 in nightly python build (Azure#25726)
* target 3.11 * ensure that proxy tests will work in the nightly pipeline * disable aiohttp extensions to allow installation on py311 * pass filter type of "None" to avoid compatibility filters stopping tests from running on the py311 invocations
1 parent ad34f0a commit 54d4213

File tree

3 files changed

+38
-14
lines changed

3 files changed

+38
-14
lines changed

eng/pipelines/templates/jobs/tests-nightly-python.yml

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
displayName: Validate Release Candidate Python - Windows
88
variables:
99
skipComponentGovernanceDetection: true
10-
PythonVersion: '3.10.0-rc.2'
10+
PythonVersion: '3.11.0-rc.1'
1111

1212
timeoutInMinutes: 90
1313

1414
pool:
15-
vmImage: 'windows-2019'
15+
name: 'azsdk-pool-mms-win-2019-general'
1616

1717
steps:
1818
- template: /eng/pipelines/templates/steps/use-python-version.yml
@@ -22,14 +22,21 @@ jobs:
2222
- script: |
2323
python -m pip freeze
2424
python -m pip --version
25-
pip install setuptools==56.0.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0
25+
pip install setuptools==56.0.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0 requests
26+
pip install $(Build.SourcesDirectory)/tools/azure-sdk-tools[build]
2627
displayName: Install Dependencies
2728
29+
- template: /eng/common/testproxy/test-proxy-tool.yml
30+
parameters:
31+
runProxy: false
32+
2833
- script: |
29-
python ./scripts/devops_tasks/setup_execute_tests.py "$(BuildTargetingString)" --junitxml="junit/test_results.xml" --toxenv="whl"
34+
python ./scripts/devops_tasks/setup_execute_tests.py "$(BuildTargetingString)" --junitxml="junit/test_results.xml" --toxenv="whl" --filter-type="None"
3035
displayName: 'Setup - Run Filtered Tests For Python $(PythonVersion)'
3136
env:
3237
YARL_NO_EXTENSIONS: 1
38+
AIOHTTP_NO_EXTENSIONS: 1
39+
PROXY_URL: "http://localhost:5000"
3340
continueOnError: true
3441
3542
- task: PublishTestResults@2
@@ -43,32 +50,40 @@ jobs:
4350
displayName: Validate Release Candidate Python - Linux
4451
variables:
4552
skipComponentGovernanceDetection: true
46-
PythonVersion: '3.10.0-rc.2'
53+
PythonVersion: '3.11.0-rc.1'
4754

4855
timeoutInMinutes: 90
4956

5057
pool:
51-
vmImage: 'ubuntu-18.04'
58+
name: 'azsdk-pool-mms-ubuntu-2004-general'
5259

5360
steps:
5461
- template: /eng/pipelines/templates/steps/use-python-version.yml
5562
parameters:
5663
versionSpec: $(PythonVersion)
5764

5865
- script: |
66+
sudo apt-get update
67+
sudo apt-get install build-essential -y
5968
python -m pip freeze
6069
python -m pip --version
61-
pip install setuptools==56.0.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0
70+
pip install setuptools==56.0.0 wheel==0.37.0 tox==3.24.3 tox-monorepo==0.1.2 packaging==21.0 requests
71+
pip install $(Build.SourcesDirectory)/tools/azure-sdk-tools[build]
6272
displayName: Install Dependencies
6373
74+
- template: /eng/common/testproxy/test-proxy-tool.yml
75+
parameters:
76+
runProxy: false
77+
6478
- script: |
6579
find /usr/lib -name "libffi.so*"
6680
ln -s /usr/lib/x86_64-linux-gnu/libffi.so.7 /usr/lib/x86_64-linux-gnu/libffi.so.6
67-
68-
python ./scripts/devops_tasks/setup_execute_tests.py "$(BuildTargetingString)" --junitxml="junit/test_results.xml" --toxenv="whl"
81+
python ./scripts/devops_tasks/setup_execute_tests.py "$(BuildTargetingString)" --junitxml="junit/test_results.xml" --toxenv="whl" --filter-type="None"
6982
displayName: 'Setup - Run Filtered Tests For Python $(PythonVersion)'
7083
env:
7184
YARL_NO_EXTENSIONS: 1
85+
AIOHTTP_NO_EXTENSIONS: 1
86+
PROXY_URL: "http://localhost:5000"
7287
continueOnError: true
7388
7489
- task: PublishTestResults@2
@@ -86,13 +101,18 @@ jobs:
86101
timeoutInMinutes: 90
87102

88103
pool:
89-
vmImage: 'ubuntu-20.04'
104+
name: 'azsdk-pool-mms-ubuntu-2004-general'
90105

91106
steps:
92107
- task: UsePythonVersion@0
93-
displayName: 'Use Python 3.7 For Build Tools'
108+
displayName: 'Use Python 3.9 For Build Tools'
94109
inputs:
95-
versionSpec: '3.7'
110+
versionSpec: '3.9'
111+
112+
113+
- template: /eng/common/testproxy/test-proxy-tool.yml
114+
parameters:
115+
runProxy: false
96116

97117
- script: |
98118
sudo apt-get update
@@ -114,10 +134,12 @@ jobs:
114134
python3 -m pip install tox tox-monorepo packaging twine codecov beautifulsoup4
115135
python3 --version
116136
cd $(Build.SourcesDirectory)
117-
python3 ./scripts/devops_tasks/setup_execute_tests.py "$(BuildTargetingString)" --junitxml="junit/test_results_38.xml" --toxenv="whl"
137+
python3 ./scripts/devops_tasks/setup_execute_tests.py "$(BuildTargetingString)" --junitxml="junit/test_results_38.xml" --toxenv="whl" --filter-type="None"
118138
displayName: 'Setup - Run Filtered Tests "Nightly" using Python Edge'
119139
env:
120140
YARL_NO_EXTENSIONS: 1
141+
PROXY_URL: "http://localhost:5000"
142+
AIOHTTP_NO_EXTENSIONS: 1
121143
continueOnError: true
122144
123145
- task: PublishTestResults@2

eng/scripts/Language-Settings.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ function Import-Dev-Cert-python
574574
Write-Host "Python Trust Methodology"
575575

576576
$pathToScript = Resolve-Path (Join-Path -Path $PSScriptRoot -ChildPath "../../scripts/devops_tasks/trust_proxy_cert.py")
577-
577+
python -m pip install requests
578578
python $pathToScript
579579
}
580580

tools/azure-sdk-tools/ci_tools/functions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,14 @@ def discover_targeted_packages(
144144

145145
# deduplicate, in case we have double coverage from the glob strings. Example: "azure-mgmt-keyvault,azure-mgmt-*"
146146
collected_directories = list(set([p for p in collected_top_level_directories if additional_contains_filter in p]))
147+
pkg_set_ci_filtered = collected_directories
147148

148149
# if we have individually queued this specific package, it's obvious that we want to build it specifically
149150
# in this case, do not honor the omission list
150151
if len(collected_directories) == 1:
151152
if compatibility_filter:
152153
pkg_set_ci_filtered = filter_for_compatibility(collected_directories)
154+
153155
# however, if there are multiple packages being built, we should honor the omission list and NOT build the omitted
154156
# packages
155157
else:

0 commit comments

Comments
 (0)