This is an automated email from the ASF dual-hosted git repository.
yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new caf661798f7 Fix PreCommit tests involving docker-in-docker after
Milvus dependency rearrangements (#37711)
caf661798f7 is described below
commit caf661798f7fd8ff9527f5c86a490091dc186a05
Author: Yi Hu <[email protected]>
AuthorDate: Wed Feb 25 13:46:19 2026 -0500
Fix PreCommit tests involving docker-in-docker after Milvus dependency
rearrangements (#37711)
---
.../workflows/beam_PreCommit_Python_Coverage.yml | 35 ++--------------------
.github/workflows/beam_PreCommit_Python_ML.yml | 6 ++--
sdks/python/setup.py | 2 +-
3 files changed, 6 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/beam_PreCommit_Python_Coverage.yml
b/.github/workflows/beam_PreCommit_Python_Coverage.yml
index a0e0db3bf9b..5ad83a50599 100644
--- a/.github/workflows/beam_PreCommit_Python_Coverage.yml
+++ b/.github/workflows/beam_PreCommit_Python_Coverage.yml
@@ -58,20 +58,14 @@ env:
jobs:
beam_PreCommit_Python_Coverage:
- name: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{
matrix.python_version }}) (${{ join(matrix.os, ', ') }})
- runs-on: ${{ matrix.os }}
+ name: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{
matrix.python_version }})
+ runs-on: [self-hosted, ubuntu-20.04, highmem]
strategy:
fail-fast: false
matrix:
job_name: [beam_PreCommit_Python_Coverage]
job_phrase: [Run Python_Coverage PreCommit]
python_version: ['3.10']
- # Run on both self-hosted and GitHub-hosted runners.
- # Some tests (marked require_docker_in_docker) can't run on Beam's
- # self-hosted runners due to Docker-in-Docker environment constraint.
- # These tests will only execute on ubuntu-latest (GitHub-hosted).
- # Context: https://github.com/apache/beam/pull/35585
- os: [[self-hosted, ubuntu-20.04, highmem], [ubuntu-latest]]
timeout-minutes: 180
if: |
github.event_name == 'push' ||
@@ -92,28 +86,9 @@ jobs:
with:
java-version: default
python-version: ${{ matrix.python_version }}
- - name: Start DinD
- uses: ./.github/actions/dind-up-action
- id: dind
- if: contains(matrix.os, 'self-hosted')
- with:
- # Pin to stable Docker version to avoid compatibility issues
- dind-image: "docker:27-dind"
- # Enable all the new features
- cleanup-dind-on-start: "true"
- smoke-test-port-mapping: "true"
- prime-testcontainers: "true"
- tmpfs-run-size: 2g
- tmpfs-varrun-size: 4g
- export-gh-env: "true"
- name: Run preCommitPyCoverage
env:
- DOCKER_HOST: ${{ contains(matrix.os, 'self-hosted') &&
steps.dind.outputs.docker-host || '' }}
TOX_TESTENV_PASSENV:
"DOCKER_*,TESTCONTAINERS_*,TC_*,BEAM_*,GRPC_*,OMP_*,OPENBLAS_*,PYTHONHASHSEED,PYTEST_*"
- TESTCONTAINERS_HOST_OVERRIDE: ${{ contains(matrix.os, 'self-hosted')
&& env.DIND_IP || '' }}
- TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: "/var/run/docker.sock"
- TESTCONTAINERS_RYUK_DISABLED: "false"
- TESTCONTAINERS_RYUK_CONTAINER_PRIVILEGED: "true"
PYTEST_ADDOPTS: "-v --tb=short --maxfail=3 --durations=20 --reruns=2
--reruns-delay=5"
TC_TIMEOUT: "120"
TC_MAX_TRIES: "120"
@@ -121,12 +96,6 @@ jobs:
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command:
:sdks:python:test-suites:tox:py310:preCommitPyCoverage
- arguments: |
- -Pposargs="${{
- contains(matrix.os, 'self-hosted') &&
- '-m (not require_docker_in_docker)' ||
- '-m require_docker_in_docker'
- }}"
- uses: codecov/codecov-action@v3
with:
flags: python
diff --git a/.github/workflows/beam_PreCommit_Python_ML.yml
b/.github/workflows/beam_PreCommit_Python_ML.yml
index cecb2e65506..d97c14437b8 100644
--- a/.github/workflows/beam_PreCommit_Python_ML.yml
+++ b/.github/workflows/beam_PreCommit_Python_ML.yml
@@ -73,13 +73,13 @@ jobs:
# Context: https://github.com/apache/beam/pull/35585.
os: [[self-hosted, ubuntu-20.04, main], [ubuntu-latest]]
exclude:
- # Temporary exclude Python 3.10, 3.11, from ubuntu-latest.
- # This results in pip dependency resolution exceeded maximum depth
issue.
- # Context: https://github.com/apache/beam/pull/35816.
+ # exercise DinD tests (needed for Milvus) for latest Python version
- python_version: '3.10'
os: [ubuntu-latest]
- python_version: '3.11'
os: [ubuntu-latest]
+ - python_version: '3.12'
+ os: [ ubuntu-latest ]
if: |
github.event_name == 'push' ||
github.event_name == 'pull_request_target' ||
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 75b0cda7135..dbb1dd68f17 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -551,7 +551,7 @@ if __name__ == '__main__':
'p312_ml_test': [
'datatable',
] + ml_base,
- 'p313_ml_test': ml_base,
+ 'p313_ml_test': ml_base + milvus_dependency,
'aws': ['boto3>=1.9,<2'],
'azure': [
'azure-storage-blob>=12.3.2,<13',
