From e094c86b0cde3559b7bea702469fbe93e577dc37 Mon Sep 17 00:00:00 2001 From: jenny <63012604+JennyPng@users.noreply.github.com> Date: Tue, 17 Mar 2026 13:20:21 -0700 Subject: [PATCH] rename ToxTestEnv --- eng/pipelines/templates/jobs/ci.tests.yml | 2 +- eng/pipelines/templates/jobs/live.tests.yml | 4 +- .../templates/stages/archetype-sdk-tests.yml | 4 +- eng/pipelines/templates/steps/build-test.yml | 6 +-- eng/scripts/invoke-tox-parallel.ps1 | 51 ------------------- eng/scripts/set_checks.py | 12 ++--- 6 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 eng/scripts/invoke-tox-parallel.ps1 diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml index 7793d636ba66..ee78ccb59f9f 100644 --- a/eng/pipelines/templates/jobs/ci.tests.yml +++ b/eng/pipelines/templates/jobs/ci.tests.yml @@ -118,7 +118,7 @@ jobs: AdditionalTestArgs: '--wheel_dir="$(Build.ArtifactStagingDirectory)"' CoverageArg: $(CoverageArg) PythonVersion: $(PythonVersion) - ToxTestEnv: $(toxenv) + CheckEnv: $(checks) ToxEnvParallel: ${{ parameters.ToxEnvParallel }} InjectedPackages: $(InjectedPackages) TestProxy: ${{ parameters.TestProxy }} diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml index 828659b8a194..f259636e0fa3 100644 --- a/eng/pipelines/templates/jobs/live.tests.yml +++ b/eng/pipelines/templates/jobs/live.tests.yml @@ -60,7 +60,7 @@ parameters: default: false - name: OSName type: string - - name: ToxTestEnv + - name: CheckEnv type: string default: 'whl' - name: UseFederatedAuth @@ -158,7 +158,7 @@ jobs: ${{ insert }}: ${{ parameters.EnvVars }} PythonVersion: $(PythonVersion) OSVmImage: $(OSVmImage) - ToxTestEnv: ${{ parameters.ToxTestEnv }} + CheckEnv: ${{ parameters.CheckEnv }} AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }} TestMarkArgument: ${{ parameters.TestMarkArgument }} InjectedPackages: ${{ parameters.InjectedPackages }} diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml index f26c79572685..7e44a439d5cb 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml @@ -85,7 +85,7 @@ parameters: - name: TestProxy type: boolean default: false - - name: ToxTestEnv + - name: CheckEnv type: string default: 'whl' - name: Packages @@ -137,7 +137,7 @@ extends: BuildDocs: ${{ parameters.BuildDocs }} TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }} TestProxy: ${{ parameters.TestProxy }} - ToxTestEnv: ${{ parameters.ToxTestEnv }} + CheckEnv: ${{ parameters.CheckEnv }} UseFederatedAuth: ${{ parameters.UseFederatedAuth }} PersistOidcToken: ${{ parameters.PersistOidcToken }} MatrixConfigs: diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml index 444830268f2c..4504740977eb 100644 --- a/eng/pipelines/templates/steps/build-test.yml +++ b/eng/pipelines/templates/steps/build-test.yml @@ -9,7 +9,7 @@ parameters: BeforeTestSteps: [] AfterTestSteps: [] CoverageArg: '' - ToxTestEnv: "" + CheckEnv: "" RunCoverage: ne(variables['CoverageArg'], '--disablecov') ToxEnvParallel: '' InjectedPackages: '' @@ -87,7 +87,7 @@ steps: ${{ parameters.CoverageArg }} --mark_arg="$markArg" --service="${{ parameters.ServiceDirectory }}" - --checks="${{ parameters.ToxTestEnv }}" + --checks="${{ parameters.CheckEnv }}" --injected-packages="${{ parameters.InjectedPackages }}"; Write-Host "Last exit code: $LASTEXITCODE"; exit $LASTEXITCODE; @@ -109,7 +109,7 @@ steps: ${{ parameters.CoverageArg }} ` --mark_arg="$markArg" ` --service="${{ parameters.ServiceDirectory }}" ` - --checks="${{ parameters.ToxTestEnv }}" ` + --checks="${{ parameters.CheckEnv }}" ` --injected-packages="${{ parameters.InjectedPackages }}"; exit $LASTEXITCODE; env: ${{ parameters.EnvVars }} diff --git a/eng/scripts/invoke-tox-parallel.ps1 b/eng/scripts/invoke-tox-parallel.ps1 deleted file mode 100644 index 5724b4f0dbb3..000000000000 --- a/eng/scripts/invoke-tox-parallel.ps1 +++ /dev/null @@ -1,51 +0,0 @@ - - -<# -.DESCRIPTION -This script is used to dispatch tox in parallel to multiple target packages. - -Because the sphinx invocation is IO-bound and do not influence each other, we are doing just simply to speed up -the total runtime. -#> - -param( - $TargetingString, - $RepoRoot, - $Check = "sphinx", - $ServiceDirectory = "", - $WheelDirectory = "" -) - -$pythonScript = Join-Path "$RepoRoot" "scripts" "devops_tasks" "dispatch_tox.py" -$jobs = @() -$packages = $TargetingString -split "," - -foreach ($package in $packages) { - $jobs += Start-Job -ScriptBlock { - param($Pkg, $ScriptPath, $RepoRoot, $Toxenv, $ServiceParam, $WheelParam) - $log = Join-Path $RepoRoot "$Toxenv-$Pkg.log" - Write-Host "& python $ScriptPath $Pkg --toxenv=$Toxenv --service `"$ServiceParam`" -w `"$WheelParam`" --disablecov 2>&1 >> $log" - & python $ScriptPath $Pkg --toxenv=$Toxenv --service "$ServiceParam" -w "$WheelParam" --disablecov 2>&1 >> $log - return $LASTEXITCODE - } -ArgumentList $package, $pythonScript, $RepoRoot, $Check, $ServiceDirectory, $WheelDirectory -} - -$jobs | ForEach-Object { $_ | Wait-Job } - -$exitCodes = $jobs | ForEach-Object { $_ | Receive-Job } -$nonZeroExit = $exitCodes | Where-Object { $_ -ne 0 } -$jobs | ForEach-Object { $_ | Remove-Job } - -Get-ChildItem $RepoRoot -Filter "$Toxenv-*.log" ` - | ForEach-Object { - Write-Host "Output for $($_.Name)" - Get-Content $_.FullName - } - -if ($nonZeroExit) { - Write-Host "One or more scripts failed with a non-zero exit code." - exit 1 -} else { - Write-Host "All scripts completed successfully." - exit 0 -} diff --git a/eng/scripts/set_checks.py b/eng/scripts/set_checks.py index 865edd1b4777..fc6144e11d97 100644 --- a/eng/scripts/set_checks.py +++ b/eng/scripts/set_checks.py @@ -28,20 +28,20 @@ def resolve_devops_variable(var_value: str) -> List[str]: if var_value.startswith("$("): return [] else: - return [tox_env.strip() for tox_env in var_value.split(",") if tox_env.strip()] + return [check.strip() for check in var_value.split(",") if check.strip()] else: return [] def set_devops_value(resolved_set: List[str]) -> None: string_value = ",".join(resolved_set) - set_ci_variable("toxenv", string_value) + set_ci_variable("checks", string_value) def remove_unsupported_values(selected_set: List[str], unsupported_values: List[str]): - for unsupported_tox_env in unsupported_values: - if unsupported_tox_env in selected_set: - selected_set.remove(unsupported_tox_env) + for unsupported_check in unsupported_values: + if unsupported_check in selected_set: + selected_set.remove(unsupported_check) def process_ci_skips(glob_string: str, service: str) -> None: @@ -93,7 +93,7 @@ def process_ci_skips(glob_string: str, service: str) -> None: "-o", "--override", dest="override_set", - help='If you have a set of tox environments that should override the defaults, provide it here. In CI this is runtime variable $(ChecksOverride). EG: "whl,sdist".', + help='If you have a set of checks that should override the defaults, provide it here. In CI this is runtime variable $(ChecksOverride). EG: "whl,sdist".', ) parser.add_argument(