Skip to content

Commit

Permalink
MDBF-857 - Volume mounts for File/Upload steps
Browse files Browse the repository at this point in the history
Some factories are using the File/Directory upload steps to move files from the worker to CI.
The data is transferred to the master which is then in charge of writing the files to destination on the host, meaning hz-bbm[1,2].

In order for this to work, the paths (from hz-bbm) should be mounted inside the container.

So far the following factories were identified:
-> f_asan_ubsan_build
-> f_big_test
-> f_asan_ubsan_build
-> f_valgrind_build
-> f_windows
-> f_windows_msi

Windows is defined by non-latent master which has already the path mounted.
The rest of the factories are defined in master-docker-nonstandard 1 and 2.

For Linux builders is it possible to use a network file share but we will not cover this for the migration but taking a note for future refactoring.
  • Loading branch information
RazvanLiviuVarzaru committed Dec 10, 2024
1 parent 4c08e43 commit 7a7779d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ services:
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
- /srv/buildbot/packages:/srv/buildbot/packages
entrypoint:
- /bin/bash
- -c
Expand Down Expand Up @@ -540,6 +541,7 @@ services:
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
- /srv/buildbot/packages:/srv/buildbot/packages
entrypoint:
- /bin/bash
- -c
Expand Down
7 changes: 4 additions & 3 deletions docker-compose/generate-config.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,10 @@ def main(args):
key: VOLUMES[:]
for key in [element.replace("/", "_") for element in MASTER_DIRECTORIES]
}
master_volumes["master-nonlatent"].append(
"/srv/buildbot/packages:/srv/buildbot/packages"
) # Using FileUpload step
for master in ["master-nonlatent", "master-docker-nonstandard", "master-docker-nonstandard-2"]:
master_volumes[master].append(
"/srv/buildbot/packages:/srv/buildbot/packages"
) # Using FileUpload step

# Capture the current environment variables' keys
current_env_keys = set(os.environ.keys())
Expand Down

0 comments on commit 7a7779d

Please sign in to comment.