diff --git a/eng/performance/benchmark_jobs.yml b/eng/performance/benchmark_jobs.yml index 3d177893a98..83c20f97ad0 100644 --- a/eng/performance/benchmark_jobs.yml +++ b/eng/performance/benchmark_jobs.yml @@ -129,11 +129,6 @@ jobs: steps: - checkout: self clean: true - - ${{ if ne(parameters.osName, 'windows') }}: - - script: wget https://bootstrap.pypa.io/pip/3.6/get-pip.py && $(Python) get-pip.py --user - displayName: Ensure pip is installed - - script: $(Python) -m pip install --user dataclasses - displayName: Install dataclasses library used in ci_setup.py - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) $(AffinityParam) $(runEnvVarsParam) $(TargetsWindowsParam) displayName: Run ci_setup.py - ${{ if eq(parameters.osName, 'windows') }}: diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index eea8899ab93..d5faff0d359 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -116,11 +116,6 @@ jobs: steps: - checkout: self clean: true - - ${{ if ne(parameters.osName, 'windows') }}: - - script: wget https://bootstrap.pypa.io/pip/3.6/get-pip.py && $(Python) get-pip.py --user - displayName: Ensure pip is installed - - script: $(Python) -m pip install --user dataclasses - displayName: Install dataclasses library used in ci_setup.py - ${{ if ne(length(parameters.channels), 0) }}: - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup --install-dir $(CorrelationStaging)dotnet $(runEnvVarsParam) $(AffinityParam) $(TargetsWindowsParam) displayName: Run ci_setup.py diff --git a/scripts/ci_setup.py b/scripts/ci_setup.py index a0ff6f01b5f..5d0e9d10366 100644 --- a/scripts/ci_setup.py +++ b/scripts/ci_setup.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from argparse import ArgumentParser, ArgumentTypeError -from dataclasses import dataclass, field from logging import getLogger import os @@ -9,7 +8,7 @@ import datetime from subprocess import check_output -from typing import Optional, List +from typing import Any, Optional, List from performance.common import get_machine_architecture, get_repo_root_path, set_environment_variable from performance.common import get_tools_directory @@ -268,36 +267,36 @@ def __process_arguments(args: List[str]): return parser.parse_args(args) -@dataclass -class CiSetupArgs: - channel: str - quiet: bool = False - commit_sha: Optional[str] = None - repository: Optional[str] = None - architecture: str = get_machine_architecture() - dotnet_path: Optional[str] = None - dotnet_versions: List[str] = field(default_factory=list) - install_dir: Optional[str] = None - build_configs: List[str] = field(default_factory=list) - pgo_status: Optional[str] = None - get_perf_hash: bool = False - perf_hash: str = 'testSha' - cli: Optional[str] = None - commit_time: Optional[str] = None - local_build: bool = False - branch: Optional[str] = None - output_file: str = os.path.join(get_tools_directory(), 'machine-setup') - not_in_lab: bool = False - queue: str = 'testQueue' - build_number: str = '1234.1' - locale: str = 'en-US' - maui_version: str = '' - affinity: Optional[str] = None - run_env_vars: Optional[List[str]] = None - target_windows: bool = True - physical_promotion: Optional[str] = None - -def main(args: CiSetupArgs): +# @dataclass +# class CiSetupArgs: +# channel: str +# quiet: bool = False +# commit_sha: Optional[str] = None +# repository: Optional[str] = None +# architecture: str = get_machine_architecture() +# dotnet_path: Optional[str] = None +# dotnet_versions: List[str] = field(default_factory=list) +# install_dir: Optional[str] = None +# build_configs: List[str] = field(default_factory=list) +# pgo_status: Optional[str] = None +# get_perf_hash: bool = False +# perf_hash: str = 'testSha' +# cli: Optional[str] = None +# commit_time: Optional[str] = None +# local_build: bool = False +# branch: Optional[str] = None +# output_file: str = os.path.join(get_tools_directory(), 'machine-setup') +# not_in_lab: bool = False +# queue: str = 'testQueue' +# build_number: str = '1234.1' +# locale: str = 'en-US' +# maui_version: str = '' +# affinity: Optional[str] = None +# run_env_vars: Optional[List[str]] = None +# target_windows: bool = True +# physical_promotion: Optional[str] = None + +def main(args: Any): verbose = not args.quiet setup_loggers(verbose=verbose) @@ -454,7 +453,8 @@ def main(args: CiSetupArgs): def __main(argv: List[str]): validate_supported_runtime() args = __process_arguments(argv) - main(CiSetupArgs(**vars(args))) + # main(CiSetupArgs(**vars(args))) + main(args) if __name__ == "__main__":