Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MDBF-933 - DockerLatentWorker containers name not unique #695

Merged
merged 1 commit into from
Jan 29, 2025
Merged

MDBF-933 - DockerLatentWorker containers name not unique #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-nonlatent
hostname: dev_master-nonlatent
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -162,7 +162,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-libvirt
hostname: dev_master-libvirt
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -201,7 +201,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: autogen_aarch64-master-0
hostname: dev_autogen_aarch64-master-0
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -240,7 +240,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: autogen_amd64-master-0
hostname: dev_autogen_amd64-master-0
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -279,7 +279,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: autogen_amd64-master-1
hostname: dev_autogen_amd64-master-1
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -318,7 +318,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: autogen_ppc64le-master-0
hostname: dev_autogen_ppc64le-master-0
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -357,7 +357,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: autogen_s390x-master-0
hostname: dev_autogen_s390x-master-0
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -396,7 +396,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: autogen_x86-master-0
hostname: dev_autogen_x86-master-0
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -435,7 +435,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-docker-nonstandard
hostname: dev_master-docker-nonstandard
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -475,7 +475,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-galera
hostname: dev_master-galera
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -514,7 +514,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-protected-branches
hostname: dev_master-protected-branches
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -553,7 +553,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-docker-nonstandard-2
hostname: dev_master-docker-nonstandard-2
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down Expand Up @@ -593,7 +593,7 @@ services:
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-bintars
hostname: dev_master-bintars
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
Expand Down
8 changes: 6 additions & 2 deletions docker-compose/generate-config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
restart: unless-stopped
container_name: {master_name}
stop_grace_period: {buildbot_stop_grace_period}
hostname: {master_name}
hostname: {master_hostname}
{volumes}
entrypoint:
- /bin/bash
Expand Down Expand Up @@ -213,10 +213,14 @@ def main(args):
port = starting_port
for master_directory in MASTER_DIRECTORIES:
master_name = master_directory.replace("/", "_")

if args.env == "dev":
master_hostname = "dev_" + master_name
else:
master_hostname = master_name
# Generate Docker Compose piece
docker_compose_piece = docker_compose_template.format(
master_name=master_name,
master_hostname=master_hostname,
master_directory=master_directory,
port=port,
mc_host=mc_host,
Expand Down