Skip to content

Commit 002139a

Browse files
committed
Added docker config to yml files again
1 parent 4f1e51b commit 002139a

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

.github/workflows/test-integrations-cloud.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3737
os: [ubuntu-20.04]
38+
services:
39+
docker:
40+
image: docker:dind # Required for Docker network management
41+
options: --privileged # Required for Docker-in-Docker operations
3842
steps:
3943
- uses: actions/[email protected]
4044
- uses: actions/setup-python@v5
@@ -107,6 +111,10 @@ jobs:
107111
# ubuntu-20.04 is the last version that supported python3.6
108112
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
109113
os: [ubuntu-20.04]
114+
services:
115+
docker:
116+
image: docker:dind # Required for Docker network management
117+
options: --privileged # Required for Docker-in-Docker operations
110118
steps:
111119
- uses: actions/[email protected]
112120
- uses: actions/setup-python@v5

scripts/split_tox_gh_actions/split_tox_gh_actions.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
"clickhouse_driver",
4444
}
4545

46+
FRAMEWORKS_NEEDING_DOCKER = {
47+
"aws_lambda",
48+
}
49+
4650
# Frameworks grouped here will be tested together to not hog all GitHub runners.
4751
# If you add or remove a group, make sure to git rm the generated YAML file as
4852
# well.
@@ -281,6 +285,7 @@ def render_template(group, frameworks, py_versions_pinned, py_versions_latest):
281285
"frameworks": frameworks,
282286
"categories": sorted(categories),
283287
"needs_clickhouse": bool(set(frameworks) & FRAMEWORKS_NEEDING_CLICKHOUSE),
288+
"needs_docker": bool(set(frameworks) & FRAMEWORKS_NEEDING_DOCKER),
284289
"needs_postgres": bool(set(frameworks) & FRAMEWORKS_NEEDING_POSTGRES),
285290
"needs_redis": bool(set(frameworks) & FRAMEWORKS_NEEDING_REDIS),
286291
"py_versions": {

scripts/split_tox_gh_actions/templates/test_group.jinja

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
1313
os: [ubuntu-20.04]
1414

15+
{% if needs_docker %}
16+
services:
17+
docker:
18+
image: docker:dind # Required for Docker network management
19+
options: --privileged # Required for Docker-in-Docker operations
20+
{% endif %}
1521
{% if needs_postgres %}
1622
services:
1723
postgres:

0 commit comments

Comments
 (0)