diff --git a/eng/ci_tools.txt b/eng/ci_tools.txt index 80928e029483..ad5286280641 100644 --- a/eng/ci_tools.txt +++ b/eng/ci_tools.txt @@ -14,6 +14,7 @@ pyproject-api==1.8.0 cibuildwheel==2.16.5 importlib-metadata==8.5.0 build==1.2.2.post1 +nh3<0.3; platform_python_implementation == "PyPy" and python_version == "3.9" # requirements leveraged for testing pytest==8.3.5 diff --git a/eng/test_tools.txt b/eng/test_tools.txt index 2bfe6a1bc62e..33aa2803182c 100644 --- a/eng/test_tools.txt +++ b/eng/test_tools.txt @@ -9,6 +9,7 @@ bandit==1.6.2 stevedore==5.4.1 pyproject-api==1.8.0 build==1.2.2.post1 +nh3<0.3; platform_python_implementation == "PyPy" and python_version == "3.9" # locking packages defined as deps from azure-sdk-tools Jinja2==3.1.6 diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index dd044ebb3515..f88ab953e02d 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -39,6 +39,11 @@ extends: ServiceDirectory: storage TestProxy: true TestTimeoutInMinutes: 120 + MatrixConfigs: + - Name: storage_ci_matrix + Path: sdk/storage/platform-matrix.json + Selection: sparse + GenerateVMJobs: true MatrixFilters: - PythonVersion=^(?!pypy3).* Artifacts: diff --git a/sdk/storage/platform-matrix.json b/sdk/storage/platform-matrix.json new file mode 100644 index 000000000000..955ea06ace76 --- /dev/null +++ b/sdk/storage/platform-matrix.json @@ -0,0 +1,73 @@ +{ + "displayNames": { + "--disablecov": "", + "false": "", + "true": "" + }, + "matrix": { + "Agent": { + "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }, + "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" } + }, + "PythonVersion": [ "3.10", "3.12" ], + "CoverageArg": "--disablecov", + "TestSamples": "false" + }, + "include": [ + { + "MacTestConfig": { + "macos311": { + "OSVmImage": "env:MACVMIMAGE", + "Pool": "env:MACPOOL", + "PythonVersion": "3.11", + "CoverageArg": "--disablecov", + "TestSamples": "false" + } + } + }, + { + "PyPyConfig": { + "ubuntu2404_pypy39": { + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", + "PythonVersion": "pypy3.9", + "CoverageArg": "--disablecov", + "TestSamples": "false" + } + } + }, + { + "CoverageConfig": { + "ubuntu2404_39_coverage": { + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", + "PythonVersion": "3.9", + "CoverageArg": "", + "TestSamples": "false" + } + } + }, + { + "Config": { + "Ubuntu2404_313": { + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", + "PythonVersion": "3.13", + "CoverageArg": "--disablecov", + "TestSamples": "false" + } + } + }, + { + "Config": { + "Ubuntu2404_314": { + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", + "PythonVersion": "3.14", + "CoverageArg": "--disablecov", + "TestSamples": "false" + } + } + } + ] +} \ No newline at end of file