Skip to content

Commit 6b6a8c0

Browse files
scbeddmsyyc
scbedd
and
msyyc
authored
Remove Python 3.8 + Standardize on azsdk-pool on affected templates (#40499)
* standardize on new pools + directly update 3.8 to 3.9 and remove 3.8 from livetest matrices Co-authored-by: Yuchao Yan <[email protected]>
1 parent f6dfb64 commit 6b6a8c0

File tree

25 files changed

+57
-89
lines changed

25 files changed

+57
-89
lines changed

‎eng/pipelines/autorest_checks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
displayName: 'Run AutoRest'
2626

2727
pool:
28-
name: azsdk-pool-mms-ubuntu-2004-general
29-
vmImage: 'ubuntu-20.04'
28+
name: azsdk-pool
29+
vmImage: 'ubuntu-22.04'
3030

3131
steps:
3232
- task: NodeTool@0

‎eng/pipelines/templates/jobs/smoke.tests.yml

+23-32
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
- job: smoke_test_eligibility
1414
displayName: Check Smoke Test Eligibility
1515
pool:
16-
name: azsdk-pool-mms-ubuntu-2004-general
17-
image: azsdk-pool-mms-ubuntu-2004-1espt
16+
name: $(LINUXPOOL)
17+
image: $(LINUXVMIMAGE)
1818
os: linux
1919
steps:
2020
- ${{ if and(ne(variables['Skip.Release'], 'true'), ne(parameters.Artifact.skipPublishPackage, 'true')) }}:
@@ -41,23 +41,20 @@ jobs:
4141
condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true))
4242
strategy:
4343
matrix:
44-
Python_38_Linux (AzureCloud):
45-
PythonVersion: '3.8'
46-
Pool: "azsdk-pool-mms-ubuntu-2004-general"
47-
OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
44+
Python_310_Linux (AzureCloud):
45+
PythonVersion: '3.10'
4846
${{ if eq(parameters.Daily, true) }}:
49-
Python_37_Linux (AzureCloud):
50-
PythonVersion: '3.7'
51-
Pool: azsdk-pool-mms-ubuntu-2004-general
52-
OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
47+
Python_39_Linux (AzureCloud):
48+
PythonVersion: '3.9'
5349

5450
pool:
55-
name: $(Pool)
56-
image: $(OSVmImage)
51+
name: $(LINUXPOOL)
52+
image: $(LINUXVMIMAGE)
5753
os: linux
5854

5955
variables:
6056
- template: /eng/pipelines/templates/variables/globals.yml
57+
- template: /eng/pipelines/templates/variables/image.yml
6158
- name: requirements
6259
${{ if eq(parameters.Daily, true) }}:
6360
value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt
@@ -79,21 +76,18 @@ jobs:
7976
condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true))
8077
strategy:
8178
matrix:
82-
Python_37_Windows (AzureCloud):
83-
PythonVersion: '3.7'
84-
Pool: azsdk-pool-mms-win-2022-general
85-
OSVmImage: azsdk-pool-mms-win-2022-1espt
86-
Python_38_Windows (AzureCloud):
87-
PythonVersion: '3.8'
88-
Pool: azsdk-pool-mms-win-2022-general
89-
OSVmImage: azsdk-pool-mms-win-2022-1espt
79+
Python_310_Windows (AzureCloud):
80+
PythonVersion: '3.10'
81+
Python_39_Windows (AzureCloud):
82+
PythonVersion: '3.9'
9083

9184
pool:
92-
name: $(Pool)
93-
image: $(OSVmImage)
85+
name: $(WINDOWSPOOL)
86+
image: $(WINDOWSVMIMAGE)
9487
os: windows
9588
variables:
9689
- template: /eng/pipelines/templates/variables/globals.yml
90+
- template: /eng/pipelines/templates/variables/image.yml
9791
- name: requirements
9892
${{ if eq(parameters.Daily, true) }}:
9993
value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt
@@ -113,22 +107,19 @@ jobs:
113107
condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true))
114108
strategy:
115109
matrix:
116-
Python_37_Mac (AzureCloud):
117-
PythonVersion: '3.7'
118-
Pool: Azure Pipelines
119-
OSVmImage: macos-latest
120-
Python_38_Mac (AzureCloud):
121-
PythonVersion: '3.8'
122-
Pool: Azure Pipelines
123-
OSVmImage: macos-latest
110+
Python_310_Mac (AzureCloud):
111+
PythonVersion: '3.10'
112+
Python_39_Mac (AzureCloud):
113+
PythonVersion: '3.9'
124114

125115
pool:
126-
name: $(Pool)
127-
vmImage: $(OSVmImage)
116+
name: $(MACPOOL)
117+
vmImage: $(MACVMIMAGE)
128118
os: macOS
129119

130120
variables:
131121
- template: /eng/pipelines/templates/variables/globals.yml
122+
- template: /eng/pipelines/templates/variables/image.yml
132123
- name: requirements
133124
${{ if eq(parameters.Daily, true) }}:
134125
value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt

‎eng/pipelines/templates/jobs/update_pr.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ variables:
1010
skipComponentGovernanceDetection: true
1111

1212
pool:
13-
name: azsdk-pool-mms-ubuntu-2204-general
14-
vmImage: 'ubuntu-22.04'
13+
name: $(LINUXPOOL)
14+
vmImage: $(LINUXVMIMAGE)
1515

1616
steps:
1717
- task: UsePythonVersion@0
18-
displayName: 'Use Python 3.8'
18+
displayName: 'Use Python 3.9'
1919
inputs:
20-
versionSpec: 3.8
20+
versionSpec: 3.9
2121

2222
- script: |
2323
python3 -m pip install -e $(Build.SourcesDirectory)/tools/azure-sdk-tools[ghtools]

‎eng/pipelines/templates/stages/archetype-python-release.yml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ stages:
1616
- stage:
1717
displayName: 'Release: ${{artifact.name}}'
1818
dependsOn: ${{parameters.DependsOn}}
19+
variables:
20+
- template: /eng/pipelines/templates/variables/image.yml
1921
condition: and(succeeded(), ne(variables['SetDevVersion'], 'true'), ne(variables['Skip.Release'], 'true'), ne(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-python-pr'))
2022
jobs:
2123
- job: TagRepository

‎eng/pipelines/templates/stages/platform-matrix.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
1010
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
1111
},
12-
"PythonVersion": [ "3.8", "3.10", "3.12" ],
12+
"PythonVersion": [ "3.10", "3.12" ],
1313
"CoverageArg": "--disablecov",
1414
"TestSamples": "false"
1515
},

‎eng/pipelines/templates/stages/python-analyze-weekly.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,16 @@ stages:
1919
- job: 'Analyze'
2020
timeoutInMinutes: 90
2121

22-
variables:
23-
- name: PythonVersion
24-
value: '3.8'
25-
2622
pool:
2723
name: $(LINUXPOOL)
2824
image: $(LINUXVMIMAGE)
2925
os: linux
3026

3127
steps:
3228
- task: UsePythonVersion@0
33-
displayName: 'Use Python 3.8'
29+
displayName: 'Use Python 3.9'
3430
inputs:
35-
versionSpec: '3.8'
31+
versionSpec: '3.9'
3632
- script: |
3733
python -m pip install -r eng/ci_tools.txt
3834
displayName: 'Prep Environment'

‎eng/pipelines/templates/steps/run_black.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ parameters:
55

66
steps:
77
- task: UsePythonVersion@0
8-
displayName: 'Use Python 3.8'
8+
displayName: 'Use Python 3.9'
99
inputs:
10-
versionSpec: '3.8'
10+
versionSpec: '3.9'
1111
condition: succeededOrFailed()
1212

1313
- script: |

‎eng/pipelines/templates/steps/run_mypy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ parameters:
88
# Please use `$(TargetingString)` to refer to the python packages glob string. This variable is set from resolve-package-targeting.yml.
99
steps:
1010
- task: UsePythonVersion@0
11-
displayName: 'Use Python 3.8'
11+
displayName: 'Use Python 3.9'
1212
inputs:
13-
versionSpec: '3.8'
13+
versionSpec: '3.9'
1414
condition: and(succeededOrFailed(), ne(variables['Skip.MyPy'],'true'))
1515

1616
- script: |

‎eng/pipelines/templates/steps/run_pylint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ parameters:
77
# Please use `$(TargetingString)` to refer to the python packages glob string. This variable is set from resolve-package-targeting.yml.
88
steps:
99
- task: UsePythonVersion@0
10-
displayName: 'Use Python 3.8'
10+
displayName: 'Use Python 3.9'
1111
inputs:
12-
versionSpec: '3.8'
12+
versionSpec: '3.9'
1313
condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'],'true'))
1414

1515
- script: |

‎eng/pipelines/templates/steps/run_pyright.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ parameters:
77
# Please use `$(TargetingString)` to refer to the python packages glob string. This variable is set from resolve-package-targeting.yml.
88
steps:
99
- task: UsePythonVersion@0
10-
displayName: 'Use Python 3.8'
10+
displayName: 'Use Python 3.9'
1111
inputs:
12-
versionSpec: '3.8'
12+
versionSpec: '3.9'
1313
condition: and(succeededOrFailed(), or(ne(variables['Skip.Pyright'],'true'), ne(variables['Skip.Verifytypes'],'true')))
1414

1515
- script: |

‎eng/pipelines/templates/steps/smoke-test-steps.yml

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ parameters:
99
default: "not-specified"
1010

1111
steps:
12-
- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
13-
parameters:
14-
AgentImage: $(OSVmImage)
15-
1612
- task: UsePythonVersion@0
1713
displayName: "Use Python $(PythonVersion)"
1814
inputs:

‎pyrightconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"reportTypeCommentUsage": true,
33
"reportMissingImports": false,
4-
"pythonVersion": "3.8"
4+
"pythonVersion": "3.9"
55
}

‎sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"matrix": {
88
"Agent": {
9-
"ubuntu-20.04": {
9+
"ubuntu-22.04": {
1010
"OSVmImage": "env:LINUXVMIMAGE",
1111
"Pool": "env:LINUXPOOL",
1212
"COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "true"
@@ -24,7 +24,7 @@
2424
"COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "false"
2525
}
2626
},
27-
"PythonVersion": ["pypy3.9", "3.8", "3.10", "3.11"],
27+
"PythonVersion": ["pypy3.9", "3.10", "3.11"],
2828
"CoverageArg": "--disablecov",
2929
"TestSamples": "false"
3030
},

‎sdk/core/azure-core/perf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
- name: LanguageVersion
3-
displayName: LanguageVersion (3.8, 3.9, 3.10, 3.11)
3+
displayName: LanguageVersion (3.9, 3.10, 3.11)
44
type: string
55
default: '3.11'
66
- name: PackageVersions

‎sdk/core/corehttp/perf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
- name: LanguageVersion
3-
displayName: LanguageVersion (3.8, 3.9, 3.10, 3.11, 3.12)
3+
displayName: LanguageVersion (3.9, 3.10, 3.11, 3.12)
44
type: string
55
default: '3.11'
66
- name: PackageVersions

‎sdk/cosmos/cosmos-emulator-matrix.json

-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
1010
},
1111
"EmulatorConfig": {
12-
"Emulator Tests Python 3.8": {
13-
"PythonVersion": "3.8",
14-
"CoverageArg": "--disablecov",
15-
"TestSamples": "false",
16-
"ToxTestEnv": "'whl,sdist'",
17-
"ACCOUNT_HOST": "https://localhost:8081/",
18-
"ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
19-
"Skip.Analyze": "true"
20-
},
2112
"Emulator Tests Python 3.9": {
2213
"PythonVersion": "3.9",
2314
"CoverageArg": "--disablecov",

‎sdk/cosmos/live-platform-matrix.json

-8
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,6 @@
6363
},
6464
{
6565
"WindowsConfig": {
66-
"Windows2022_38_long": {
67-
"OSVmImage": "env:WINDOWSVMIMAGE",
68-
"Pool": "env:WINDOWSPOOL",
69-
"PythonVersion": "3.8",
70-
"CoverageArg": "--disablecov",
71-
"TestSamples": "false",
72-
"TestMarkArgument": "cosmosLong"
73-
},
7466
"Windows2022_310_long": {
7567
"OSVmImage": "env:WINDOWSVMIMAGE",
7668
"Pool": "env:WINDOWSPOOL",

‎sdk/eventhub/perf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
- name: LanguageVersion
3-
displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11)
3+
displayName: LanguageVersion (3.9, 3.10, 3.11)
44
type: string
55
default: '3.11'
66
- name: PackageVersions

‎sdk/identity/platform-matrix.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"include": [
99
{
1010
"Config": {
11-
"ubuntu_20.04_3.8_msal": {
11+
"ubuntu_20.04_3.9_msal": {
1212
"OSVmImage": "env:LINUXVMIMAGE",
1313
"Pool": "env:LINUXPOOL",
14-
"PythonVersion": "3.8",
14+
"PythonVersion": "3.9",
1515
"CoverageArg": "--disablecov",
1616
"InjectedPackages": "git+https://github.com/AzureAD/microsoft-authentication-library-for-python@dev",
1717
"UnsupportedToxEnvironments": "mindependency,latestdependency"

‎sdk/keyvault/azure-keyvault-secrets/pyrightconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"reportMissingImports": false,
3-
"pythonVersion": "3.8",
3+
"pythonVersion": "3.9",
44
"exclude": [
55
"**/_generated/**"
66
]

‎sdk/servicebus/perf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
- name: LanguageVersion
3-
displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11)
3+
displayName: LanguageVersion (3.9, 3.10, 3.11)
44
type: string
55
default: '3.11'
66
- name: PackageVersions

‎sdk/storage/azure-storage-blob/perf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
- name: LanguageVersion
3-
displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11)
3+
displayName: LanguageVersion (3.9, 3.10, 3.11)
44
type: string
55
default: '3.11'
66
- name: PackageVersions

‎sdk/storage/azure-storage-file-datalake/perf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
- name: LanguageVersion
3-
displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11)
3+
displayName: LanguageVersion (3.9, 3.10, 3.11)
44
type: string
55
default: '3.11'
66
- name: PackageVersions

‎sdk/storage/azure-storage-file-share/perf.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
- name: LanguageVersion
3-
displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11)
3+
displayName: LanguageVersion (3.9, 3.10, 3.11)
44
type: string
55
default: '3.11'
66
- name: PackageVersions
@@ -14,7 +14,7 @@ parameters:
1414
- name: Arguments
1515
displayName: Arguments (regex of arguments to run)
1616
type: string
17-
default: '(10240)|(10485760)|(1073741824)'
17+
default: '(10240)|(10485760)|(1073741824)'
1818
- name: Iterations
1919
displayName: Iterations (times to run each test)
2020
type: number

‎sdk/storage/platform-matrix-all-versions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"Ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
1010
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
1111
},
12-
"PythonVersion": [ "3.8", "3.9", "3.10"],
12+
"PythonVersion": [ "3.9", "3.10"],
1313
"CoverageArg": "--disablecov",
1414
"TestSamples": "false",
1515
"AZURE_LIVE_TEST_SERVICE_VERSION": [

0 commit comments

Comments
 (0)