From e3c3298e38716a59db4eab85c580993b0b576010 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Mon, 14 Apr 2025 09:15:21 -0700 Subject: [PATCH 1/4] standardize on new pools + directly update 3.8 to 3.9 and remove 3.8 from livetest matrices --- eng/pipelines/autorest_checks.yml | 4 +- eng/pipelines/templates/jobs/smoke.tests.yml | 52 +++++++++---------- eng/pipelines/templates/jobs/update_pr.yml | 8 +-- .../templates/stages/platform-matrix.json | 2 +- .../stages/python-analyze-weekly.yml | 8 +-- eng/pipelines/templates/steps/run_black.yml | 4 +- eng/pipelines/templates/steps/run_mypy.yml | 4 +- eng/pipelines/templates/steps/run_pylint.yml | 4 +- eng/pipelines/templates/steps/run_pyright.yml | 4 +- pyrightconfig.json | 2 +- .../collect_api_version.yml | 6 +-- scripts/issue_helper/issue_helper.yml | 8 +-- scripts/release_helper/release_helper.yml | 10 ++-- .../release_sdk_status/release_sdk_status.yml | 4 +- .../phonenumbers-livetest-matrix.json | 4 +- sdk/core/azure-core/perf.yml | 2 +- sdk/core/corehttp/perf.yml | 2 +- sdk/cosmos/cosmos-emulator-matrix.json | 9 ---- sdk/cosmos/live-platform-matrix.json | 8 --- sdk/eventhub/perf.yml | 2 +- sdk/identity/platform-matrix.json | 4 +- .../azure-keyvault-secrets/pyrightconfig.json | 2 +- sdk/servicebus/perf.yml | 2 +- sdk/storage/azure-storage-blob/perf.yml | 2 +- .../azure-storage-file-datalake/perf.yml | 2 +- sdk/storage/azure-storage-file-share/perf.yml | 4 +- sdk/storage/platform-matrix-all-versions.json | 2 +- 27 files changed, 72 insertions(+), 93 deletions(-) diff --git a/eng/pipelines/autorest_checks.yml b/eng/pipelines/autorest_checks.yml index cfdec457b49c..20d3433a15c1 100644 --- a/eng/pipelines/autorest_checks.yml +++ b/eng/pipelines/autorest_checks.yml @@ -25,8 +25,8 @@ jobs: displayName: 'Run AutoRest' pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: 'ubuntu-20.04' + name: azsdk-pool + vmImage: 'ubuntu-22.04' steps: - task: NodeTool@0 diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml index 1dfb9ba0ef63..44a51b3fff3c 100644 --- a/eng/pipelines/templates/jobs/smoke.tests.yml +++ b/eng/pipelines/templates/jobs/smoke.tests.yml @@ -13,8 +13,8 @@ jobs: - job: smoke_test_eligibility displayName: Check Smoke Test Eligibility pool: - name: azsdk-pool-mms-ubuntu-2004-general - image: azsdk-pool-mms-ubuntu-2004-1espt + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: - ${{ if and(ne(variables['Skip.Release'], 'true'), ne(parameters.Artifact.skipPublishPackage, 'true')) }}: @@ -41,15 +41,15 @@ jobs: condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true)) strategy: matrix: - Python_38_Linux (AzureCloud): - PythonVersion: '3.8' - Pool: "azsdk-pool-mms-ubuntu-2004-general" - OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt + Python_310_Linux (AzureCloud): + PythonVersion: '3.10' + Pool: $(LINUXPOOL) + OSVmImage: $(LINUXVMIMAGE) ${{ if eq(parameters.Daily, true) }}: - Python_37_Linux (AzureCloud): - PythonVersion: '3.7' - Pool: azsdk-pool-mms-ubuntu-2004-general - OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt + Python_39_Linux (AzureCloud): + PythonVersion: '3.9' + Pool: $(LINUXPOOL) + OSVmImage: $(LINUXVMIMAGE) pool: name: $(Pool) @@ -79,14 +79,14 @@ jobs: condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true)) strategy: matrix: - Python_37_Windows (AzureCloud): - PythonVersion: '3.7' - Pool: azsdk-pool-mms-win-2022-general - OSVmImage: azsdk-pool-mms-win-2022-1espt - Python_38_Windows (AzureCloud): - PythonVersion: '3.8' - Pool: azsdk-pool-mms-win-2022-general - OSVmImage: azsdk-pool-mms-win-2022-1espt + Python_310_Windows (AzureCloud): + PythonVersion: '3.10' + Pool: $(LINUXPOOL) + OSVmImage: $(LINUXVMIMAGE) + Python_39_Windows (AzureCloud): + PythonVersion: '3.9' + Pool: $(LINUXPOOL) + OSVmImage: $(LINUXVMIMAGE) pool: name: $(Pool) @@ -113,14 +113,14 @@ jobs: condition: and(succeeded(), eq(dependencies.smoke_test_eligibility.outputs['output_eligibility.RunSmokeTests'], true)) strategy: matrix: - Python_37_Mac (AzureCloud): - PythonVersion: '3.7' - Pool: Azure Pipelines - OSVmImage: macos-latest - Python_38_Mac (AzureCloud): - PythonVersion: '3.8' - Pool: Azure Pipelines - OSVmImage: macos-latest + Python_310_Mac (AzureCloud): + PythonVersion: '3.10' + Pool: $(MACPOOL) + OSVmImage: $(MACVMIMAGE) + Python_39_Mac (AzureCloud): + PythonVersion: '3.9' + Pool: $(MACPOOL) + OSVmImage: $(MACVMIMAGE) pool: name: $(Pool) diff --git a/eng/pipelines/templates/jobs/update_pr.yml b/eng/pipelines/templates/jobs/update_pr.yml index 706684115f58..aae7c6ee001e 100644 --- a/eng/pipelines/templates/jobs/update_pr.yml +++ b/eng/pipelines/templates/jobs/update_pr.yml @@ -10,14 +10,14 @@ variables: skipComponentGovernanceDetection: true pool: - name: azsdk-pool-mms-ubuntu-2204-general - vmImage: 'ubuntu-22.04' + name: $(LINUXPOOL) + vmImage: $(LINUXVMIMAGE) steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.8' + displayName: 'Use Python 3.9' inputs: - versionSpec: 3.8 + versionSpec: 3.9 - script: | python3 -m pip install -e $(Build.SourcesDirectory)/tools/azure-sdk-tools[ghtools] diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index b53097680972..d95586a2a5fc 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -9,7 +9,7 @@ "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }, "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" } }, - "PythonVersion": [ "3.8", "3.10", "3.12" ], + "PythonVersion": [ "3.10", "3.12" ], "CoverageArg": "--disablecov", "TestSamples": "false" }, diff --git a/eng/pipelines/templates/stages/python-analyze-weekly.yml b/eng/pipelines/templates/stages/python-analyze-weekly.yml index 26640c206612..a0ee7ce6f52e 100644 --- a/eng/pipelines/templates/stages/python-analyze-weekly.yml +++ b/eng/pipelines/templates/stages/python-analyze-weekly.yml @@ -19,10 +19,6 @@ stages: - job: 'Analyze' timeoutInMinutes: 90 - variables: - - name: PythonVersion - value: '3.8' - pool: name: $(LINUXPOOL) image: $(LINUXVMIMAGE) @@ -30,9 +26,9 @@ stages: steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.8' + displayName: 'Use Python 3.9' inputs: - versionSpec: '3.8' + versionSpec: '3.9' - script: | python -m pip install -r eng/ci_tools.txt displayName: 'Prep Environment' diff --git a/eng/pipelines/templates/steps/run_black.yml b/eng/pipelines/templates/steps/run_black.yml index 7bc123fe9e45..da531b919c18 100644 --- a/eng/pipelines/templates/steps/run_black.yml +++ b/eng/pipelines/templates/steps/run_black.yml @@ -5,9 +5,9 @@ parameters: steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.8' + displayName: 'Use Python 3.9' inputs: - versionSpec: '3.8' + versionSpec: '3.9' condition: succeededOrFailed() - script: | diff --git a/eng/pipelines/templates/steps/run_mypy.yml b/eng/pipelines/templates/steps/run_mypy.yml index 7a520b91132b..a282fcf9df8c 100644 --- a/eng/pipelines/templates/steps/run_mypy.yml +++ b/eng/pipelines/templates/steps/run_mypy.yml @@ -8,9 +8,9 @@ parameters: # Please use `$(TargetingString)` to refer to the python packages glob string. This variable is set from resolve-package-targeting.yml. steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.8' + displayName: 'Use Python 3.9' inputs: - versionSpec: '3.8' + versionSpec: '3.9' condition: and(succeededOrFailed(), ne(variables['Skip.MyPy'],'true')) - script: | diff --git a/eng/pipelines/templates/steps/run_pylint.yml b/eng/pipelines/templates/steps/run_pylint.yml index 7087cbc88b22..afb489b3ff84 100644 --- a/eng/pipelines/templates/steps/run_pylint.yml +++ b/eng/pipelines/templates/steps/run_pylint.yml @@ -7,9 +7,9 @@ parameters: # Please use `$(TargetingString)` to refer to the python packages glob string. This variable is set from resolve-package-targeting.yml. steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.8' + displayName: 'Use Python 3.9' inputs: - versionSpec: '3.8' + versionSpec: '3.9' condition: and(succeededOrFailed(), ne(variables['Skip.Pylint'],'true')) - script: | diff --git a/eng/pipelines/templates/steps/run_pyright.yml b/eng/pipelines/templates/steps/run_pyright.yml index 44d262e98d2c..b5a28ece08a4 100644 --- a/eng/pipelines/templates/steps/run_pyright.yml +++ b/eng/pipelines/templates/steps/run_pyright.yml @@ -7,9 +7,9 @@ parameters: # Please use `$(TargetingString)` to refer to the python packages glob string. This variable is set from resolve-package-targeting.yml. steps: - task: UsePythonVersion@0 - displayName: 'Use Python 3.8' + displayName: 'Use Python 3.9' inputs: - versionSpec: '3.8' + versionSpec: '3.9' condition: and(succeededOrFailed(), or(ne(variables['Skip.Pyright'],'true'), ne(variables['Skip.Verifytypes'],'true'))) - script: | diff --git a/pyrightconfig.json b/pyrightconfig.json index 0477ee40c07e..23f5155848f6 100644 --- a/pyrightconfig.json +++ b/pyrightconfig.json @@ -1,5 +1,5 @@ { "reportTypeCommentUsage": true, "reportMissingImports": false, - "pythonVersion": "3.8" + "pythonVersion": "3.9" } diff --git a/scripts/collect_api_version_for_multi_api_sdk/collect_api_version.yml b/scripts/collect_api_version_for_multi_api_sdk/collect_api_version.yml index 003724854180..9249b9849eb1 100644 --- a/scripts/collect_api_version_for_multi_api_sdk/collect_api_version.yml +++ b/scripts/collect_api_version_for_multi_api_sdk/collect_api_version.yml @@ -22,12 +22,12 @@ jobs: strategy: maxParallel: 1 pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: 'ubuntu-20.04' + name: azsdk-pool + vmImage: 'ubuntu-22.04' steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.8' + versionSpec: '3.9' addToPath: true architecture: 'x64' - bash: | diff --git a/scripts/issue_helper/issue_helper.yml b/scripts/issue_helper/issue_helper.yml index 9d0799b5ebcc..0950c887986d 100644 --- a/scripts/issue_helper/issue_helper.yml +++ b/scripts/issue_helper/issue_helper.yml @@ -26,17 +26,17 @@ variables: jobs: - job: IssueHelper - displayName: IssueHelper Python 3.8 + displayName: IssueHelper Python 3.9 timeoutInMinutes: 30 strategy: maxParallel: 3 pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: 'ubuntu-20.04' + name: azsdk-pool + vmImage: 'ubuntu-22.04' steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.8' + versionSpec: '3.9' addToPath: true architecture: 'x64' - bash: | diff --git a/scripts/release_helper/release_helper.yml b/scripts/release_helper/release_helper.yml index 770414dfcd80..a41c02202af8 100644 --- a/scripts/release_helper/release_helper.yml +++ b/scripts/release_helper/release_helper.yml @@ -30,19 +30,19 @@ variables: jobs: - job: ReleaseHelper - displayName: ReleaseHelper Python 3.8 + displayName: ReleaseHelper Python 3.9 timeoutInMinutes: 30 strategy: maxParallel: 1 pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: 'ubuntu-20.04' + name: azsdk-pool + vmImage: 'ubuntu-22.04' variables: Codeql.Enabled: false steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.8' + versionSpec: '3.9' addToPath: true architecture: 'x64' - bash: | @@ -54,7 +54,7 @@ jobs: # clone(REPO: https://github.com/Azure/azure-sdk-for-python.git, USR_NAME: Azure, USR_TOKEN: xxxxxxxxxxxxx) mkdir file-storage git clone ${FILE_REPO:0:8}$(USR_NAME):$(Yuchao-GitToken)@${FILE_REPO:8} $(pwd)/file-storage - + mkdir azure-rest-api-specs git clone -b $(SPEC_BRANCH) https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs diff --git a/scripts/release_sdk_status/release_sdk_status.yml b/scripts/release_sdk_status/release_sdk_status.yml index 6d3dd482f4d7..66e5b4388211 100644 --- a/scripts/release_sdk_status/release_sdk_status.yml +++ b/scripts/release_sdk_status/release_sdk_status.yml @@ -29,7 +29,7 @@ variables: jobs: - job: ReleaseSdkStatus - displayName: ReleaseSdkStatus Python 3.8 + displayName: ReleaseSdkStatus Python 3.9 timeoutInMinutes: 300 strategy: maxParallel: 1 @@ -39,7 +39,7 @@ jobs: steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.8' + versionSpec: '3.9' addToPath: true architecture: 'x64' - bash: | diff --git a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json index 2369553df062..011478d774d4 100644 --- a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json +++ b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json @@ -6,7 +6,7 @@ }, "matrix": { "Agent": { - "ubuntu-20.04": { + "ubuntu-22.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL", "COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "true" @@ -24,7 +24,7 @@ "COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "false" } }, - "PythonVersion": ["pypy3.9", "3.8", "3.10", "3.11"], + "PythonVersion": ["pypy3.9", "3.10", "3.11"], "CoverageArg": "--disablecov", "TestSamples": "false" }, diff --git a/sdk/core/azure-core/perf.yml b/sdk/core/azure-core/perf.yml index 97e45420ba93..05498a7dd5de 100644 --- a/sdk/core/azure-core/perf.yml +++ b/sdk/core/azure-core/perf.yml @@ -1,6 +1,6 @@ parameters: - name: LanguageVersion - displayName: LanguageVersion (3.8, 3.9, 3.10, 3.11) + displayName: LanguageVersion (3.9, 3.10, 3.11) type: string default: '3.11' - name: PackageVersions diff --git a/sdk/core/corehttp/perf.yml b/sdk/core/corehttp/perf.yml index 077c6a47ce92..c8c9bb59e1cd 100644 --- a/sdk/core/corehttp/perf.yml +++ b/sdk/core/corehttp/perf.yml @@ -1,6 +1,6 @@ parameters: - name: LanguageVersion - displayName: LanguageVersion (3.8, 3.9, 3.10, 3.11, 3.12) + displayName: LanguageVersion (3.9, 3.10, 3.11, 3.12) type: string default: '3.11' - name: PackageVersions diff --git a/sdk/cosmos/cosmos-emulator-matrix.json b/sdk/cosmos/cosmos-emulator-matrix.json index 8adb61147d8d..dd4ec60558fa 100644 --- a/sdk/cosmos/cosmos-emulator-matrix.json +++ b/sdk/cosmos/cosmos-emulator-matrix.json @@ -9,15 +9,6 @@ "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" } }, "EmulatorConfig": { - "Emulator Tests Python 3.8": { - "PythonVersion": "3.8", - "CoverageArg": "--disablecov", - "TestSamples": "false", - "ToxTestEnv": "'whl,sdist'", - "ACCOUNT_HOST": "https://localhost:8081/", - "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==", - "Skip.Analyze": "true" - }, "Emulator Tests Python 3.9": { "PythonVersion": "3.9", "CoverageArg": "--disablecov", diff --git a/sdk/cosmos/live-platform-matrix.json b/sdk/cosmos/live-platform-matrix.json index 485a15ca92e8..040c92847f82 100644 --- a/sdk/cosmos/live-platform-matrix.json +++ b/sdk/cosmos/live-platform-matrix.json @@ -63,14 +63,6 @@ }, { "WindowsConfig": { - "Windows2022_38_long": { - "OSVmImage": "env:WINDOWSVMIMAGE", - "Pool": "env:WINDOWSPOOL", - "PythonVersion": "3.8", - "CoverageArg": "--disablecov", - "TestSamples": "false", - "TestMarkArgument": "cosmosLong" - }, "Windows2022_310_long": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL", diff --git a/sdk/eventhub/perf.yml b/sdk/eventhub/perf.yml index f8368af98ec1..1226fd33ace2 100644 --- a/sdk/eventhub/perf.yml +++ b/sdk/eventhub/perf.yml @@ -1,6 +1,6 @@ parameters: - name: LanguageVersion - displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11) + displayName: LanguageVersion (3.9, 3.10, 3.11) type: string default: '3.11' - name: PackageVersions diff --git a/sdk/identity/platform-matrix.json b/sdk/identity/platform-matrix.json index 32243683c9c4..ce6f9707685c 100644 --- a/sdk/identity/platform-matrix.json +++ b/sdk/identity/platform-matrix.json @@ -8,10 +8,10 @@ "include": [ { "Config": { - "ubuntu_20.04_3.8_msal": { + "ubuntu_20.04_3.9_msal": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL", - "PythonVersion": "3.8", + "PythonVersion": "3.9", "CoverageArg": "--disablecov", "InjectedPackages": "git+https://github.com/AzureAD/microsoft-authentication-library-for-python@dev", "UnsupportedToxEnvironments": "mindependency,latestdependency" diff --git a/sdk/keyvault/azure-keyvault-secrets/pyrightconfig.json b/sdk/keyvault/azure-keyvault-secrets/pyrightconfig.json index 7ce535ebfaa3..5ed7280eefe2 100644 --- a/sdk/keyvault/azure-keyvault-secrets/pyrightconfig.json +++ b/sdk/keyvault/azure-keyvault-secrets/pyrightconfig.json @@ -1,6 +1,6 @@ { "reportMissingImports": false, - "pythonVersion": "3.8", + "pythonVersion": "3.9", "exclude": [ "**/_generated/**" ] diff --git a/sdk/servicebus/perf.yml b/sdk/servicebus/perf.yml index 9814cbf51f9e..bb41f1a1d78a 100644 --- a/sdk/servicebus/perf.yml +++ b/sdk/servicebus/perf.yml @@ -1,6 +1,6 @@ parameters: - name: LanguageVersion - displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11) + displayName: LanguageVersion (3.9, 3.10, 3.11) type: string default: '3.11' - name: PackageVersions diff --git a/sdk/storage/azure-storage-blob/perf.yml b/sdk/storage/azure-storage-blob/perf.yml index fd11ce8169f9..6bf63bb96d6a 100644 --- a/sdk/storage/azure-storage-blob/perf.yml +++ b/sdk/storage/azure-storage-blob/perf.yml @@ -1,6 +1,6 @@ parameters: - name: LanguageVersion - displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11) + displayName: LanguageVersion (3.9, 3.10, 3.11) type: string default: '3.11' - name: PackageVersions diff --git a/sdk/storage/azure-storage-file-datalake/perf.yml b/sdk/storage/azure-storage-file-datalake/perf.yml index 10da1756f1a8..8e4de032838b 100644 --- a/sdk/storage/azure-storage-file-datalake/perf.yml +++ b/sdk/storage/azure-storage-file-datalake/perf.yml @@ -1,6 +1,6 @@ parameters: - name: LanguageVersion - displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11) + displayName: LanguageVersion (3.9, 3.10, 3.11) type: string default: '3.11' - name: PackageVersions diff --git a/sdk/storage/azure-storage-file-share/perf.yml b/sdk/storage/azure-storage-file-share/perf.yml index b7e90d50ec27..5d65495e9917 100644 --- a/sdk/storage/azure-storage-file-share/perf.yml +++ b/sdk/storage/azure-storage-file-share/perf.yml @@ -1,6 +1,6 @@ parameters: - name: LanguageVersion - displayName: LanguageVersion (3.7, 3.8, 3.9, 3.10, 3.11) + displayName: LanguageVersion (3.9, 3.10, 3.11) type: string default: '3.11' - name: PackageVersions @@ -14,7 +14,7 @@ parameters: - name: Arguments displayName: Arguments (regex of arguments to run) type: string - default: '(10240)|(10485760)|(1073741824)' + default: '(10240)|(10485760)|(1073741824)' - name: Iterations displayName: Iterations (times to run each test) type: number diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json index 115bda0a341b..d0fa83fb54d2 100644 --- a/sdk/storage/platform-matrix-all-versions.json +++ b/sdk/storage/platform-matrix-all-versions.json @@ -9,7 +9,7 @@ "Ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }, "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" } }, - "PythonVersion": [ "3.8", "3.9", "3.10"], + "PythonVersion": [ "3.9", "3.10"], "CoverageArg": "--disablecov", "TestSamples": "false", "AZURE_LIVE_TEST_SERVICE_VERSION": [ From f43726345e757336892b5b7463e4a3603e3bef34 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 15 Apr 2025 10:40:18 -0700 Subject: [PATCH 2/4] need to reference image.yml from the archetype-python-release --- eng/pipelines/templates/stages/archetype-python-release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/templates/stages/archetype-python-release.yml b/eng/pipelines/templates/stages/archetype-python-release.yml index afbd1cef4a25..393145d73d9e 100644 --- a/eng/pipelines/templates/stages/archetype-python-release.yml +++ b/eng/pipelines/templates/stages/archetype-python-release.yml @@ -16,6 +16,8 @@ stages: - stage: displayName: 'Release: ${{artifact.name}}' dependsOn: ${{parameters.DependsOn}} + variables: + - template: /eng/pipelines/templates/variables/image.yml condition: and(succeeded(), ne(variables['SetDevVersion'], 'true'), ne(variables['Skip.Release'], 'true'), ne(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-python-pr')) jobs: - job: TagRepository From 6907fb4cfb6a9bca88b38735dc0bc6f7135423f0 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 15 Apr 2025 11:47:13 -0700 Subject: [PATCH 3/4] hopefully final fix for smoke test checks --- eng/pipelines/templates/jobs/smoke.tests.yml | 27 +++++++------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml index 44a51b3fff3c..bb1fb221ba98 100644 --- a/eng/pipelines/templates/jobs/smoke.tests.yml +++ b/eng/pipelines/templates/jobs/smoke.tests.yml @@ -43,21 +43,18 @@ jobs: matrix: Python_310_Linux (AzureCloud): PythonVersion: '3.10' - Pool: $(LINUXPOOL) - OSVmImage: $(LINUXVMIMAGE) ${{ if eq(parameters.Daily, true) }}: Python_39_Linux (AzureCloud): PythonVersion: '3.9' - Pool: $(LINUXPOOL) - OSVmImage: $(LINUXVMIMAGE) pool: - name: $(Pool) - image: $(OSVmImage) + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux variables: - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml - name: requirements ${{ if eq(parameters.Daily, true) }}: value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt @@ -81,19 +78,16 @@ jobs: matrix: Python_310_Windows (AzureCloud): PythonVersion: '3.10' - Pool: $(LINUXPOOL) - OSVmImage: $(LINUXVMIMAGE) Python_39_Windows (AzureCloud): PythonVersion: '3.9' - Pool: $(LINUXPOOL) - OSVmImage: $(LINUXVMIMAGE) pool: - name: $(Pool) - image: $(OSVmImage) + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) os: windows variables: - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml - name: requirements ${{ if eq(parameters.Daily, true) }}: value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt @@ -115,20 +109,17 @@ jobs: matrix: Python_310_Mac (AzureCloud): PythonVersion: '3.10' - Pool: $(MACPOOL) - OSVmImage: $(MACVMIMAGE) Python_39_Mac (AzureCloud): PythonVersion: '3.9' - Pool: $(MACPOOL) - OSVmImage: $(MACVMIMAGE) pool: - name: $(Pool) - vmImage: $(OSVmImage) + name: $(MACPOOL) + vmImage: $(MACVMIMAGE) os: macOS variables: - template: /eng/pipelines/templates/variables/globals.yml + - template: /eng/pipelines/templates/variables/image.yml - name: requirements ${{ if eq(parameters.Daily, true) }}: value: $(Build.SourcesDirectory)/common/smoketest/requirements.txt From 9f17c3ce38fe726e50b319633ec4b44e6c64cd3b Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 15 Apr 2025 12:33:43 -0700 Subject: [PATCH 4/4] remove verify-agent-os that is unnecessary due to using 1es pools --- eng/pipelines/templates/steps/smoke-test-steps.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/pipelines/templates/steps/smoke-test-steps.yml b/eng/pipelines/templates/steps/smoke-test-steps.yml index 688f0065fea4..d76ee170af97 100644 --- a/eng/pipelines/templates/steps/smoke-test-steps.yml +++ b/eng/pipelines/templates/steps/smoke-test-steps.yml @@ -9,10 +9,6 @@ parameters: default: "not-specified" steps: - - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml - parameters: - AgentImage: $(OSVmImage) - - task: UsePythonVersion@0 displayName: "Use Python $(PythonVersion)" inputs: