Skip to content

Commit 1e03a43

Browse files
workflows+gradle: use require_docker_in_docker marker
1 parent 81319fb commit 1e03a43

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

.github/workflows/beam_PostCommit_Python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ jobs:
6363
job_phrase: [Run Python PostCommit]
6464
python_version: ['3.9', '3.10', '3.11', '3.12']
6565
# Run on both self-hosted and GitHub-hosted runners.
66-
# Some tests (marked require_non_self_hosted) can't run on Beam's
67-
# self-hosted runners due to Docker-in-Docker or other environment
68-
# limitations. These tests will only execute on ubuntu-latest
69-
# (GitHub-hosted). Context: https://github.com/apache/beam/pull/35585
66+
# Some tests (marked require_docker_in_docker) can't run on Beam's
67+
# self-hosted runners due to Docker-in-Docker environment constraint.
68+
# These tests will only execute on ubuntu-latest (GitHub-hosted).
69+
# Context: https://github.com/apache/beam/pull/35585
7070
os: [[self-hosted, ubuntu-20.04, highmem22], [ubuntu-latest]]
7171
if: |
7272
github.event_name == 'workflow_dispatch' ||

.github/workflows/beam_PreCommit_Python_ML.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ jobs:
6767
job_phrase: ['Run Python_ML PreCommit']
6868
python_version: ['3.9','3.10','3.11','3.12']
6969
# Run on both self-hosted and GitHub-hosted runners.
70-
# Some tests (marked require_non_self_hosted) can't run on Beam's
71-
# self-hosted runners due to Docker-in-Docker or other environment
72-
# limitations. These tests will only execute on ubuntu-latest
73-
# (GitHub-hosted). Context: https://github.com/apache/beam/pull/35585
70+
# Some tests (marked require_docker_in_docker) can't run on Beam's
71+
# self-hosted runners due to Docker-in-Docker environment constraint.
72+
# These tests will only execute on ubuntu-latest (GitHub-hosted).
73+
# Context: https://github.com/apache/beam/pull/35585
7474
os: [[self-hosted, ubuntu-20.04, main], [ubuntu-latest]]
7575
if: |
7676
github.event_name == 'push' ||

sdks/python/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ markers =
7070
uses_mock_api: tests that uses the mock API cluster.
7171
uses_feast: tests that uses feast in some way
7272
gemini_postcommit: gemini postcommits that need additional deps.
73-
require_non_self_hosted: tests which can't be run on Beam's self hosted GitHub Actions runners. Usually this is because of issues with docker-in-docker or other environmental challenges. Context: https://github.com/apache/beam/pull/35585
73+
require_docker_in_docker: tests that require running Docker inside Docker (Docker-in-Docker), which is not supported on Beam’s self-hosted runners. Context: https://github.com/apache/beam/pull/35585
7474

7575
# Default timeout intended for unit tests.
7676
# If certain tests need a different value, please see the docs on how to

sdks/python/test-suites/direct/common.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -419,13 +419,14 @@ task feastIntegrationTest {
419419
}
420420
}
421421

422-
// Integration tests that must run on non self-hosted environments.
423-
// These tests are marked with the `require_non_self_hosted` pytest marker
424-
// because they rely on features like Docker-in-Docker or other system-level
425-
// configurations that are not supported on Beam's self-hosted GitHub Actions
426-
// runners. They will be executed on GitHub-hosted runners
427-
// (e.g., ubuntu-latest). Context: https://github.com/apache/beam/pull/35585
428-
task nonSelfHostedIntegrationTest {
422+
// Integration tests that require Docker-in-Docker capabilities.
423+
// These tests are marked with the `require_docker_in_docker` pytest marker
424+
// because they rely on Docker-in-Docker configurations that are not supported
425+
// on Beam's self-hosted GitHub Actions runners. Docker-in-Docker works on
426+
// ubuntu-latest GitHub-hosted runners but not on self-hosted environments due
427+
// to containerization architecture differences.
428+
// Context: https://github.com/apache/beam/pull/35585
429+
task dockerInDockerIntegrationTest {
429430
dependsOn 'installGcpTest'
430431
dependsOn ':sdks:python:sdist'
431432

@@ -434,7 +435,7 @@ task nonSelfHostedIntegrationTest {
434435
def argMap = [
435436
"test_opts": testOpts,
436437
"suite": "postCommitIT-direct-py${pythonVersionSuffix}",
437-
"collect": "require_non_self_hosted",
438+
"collect": "require_docker_in_docker",
438439
"runner": "TestDirectRunner",
439440
]
440441
def cmdArgs = mapToArgString(argMap)
@@ -455,7 +456,7 @@ project.tasks.register("inferencePostCommitIT") {
455456
'transformersInferenceTest',
456457
'testcontainersTest',
457458
'feastIntegrationTest',
458-
'nonSelfHostedIntegrationTest',
459+
'dockerInDockerIntegrationTest',
459460
// (TODO) https://github.com/apache/beam/issues/25799
460461
// uncomment tfx bsl tests once tfx supports protobuf 4.x
461462
// 'tfxInferenceTest',

0 commit comments

Comments
 (0)