diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2020-06-20 12:15:55 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-06-20 12:15:55 -0700 |
| commit | b57379c6b204870a568ccc7adcad1712e715a536 (patch) | |
| tree | d566dac6b4ba30d0d66f0e4cd7ab3a5973812253 /lavalab-gen.py | |
| parent | 9596a7d56f8e4b6653ae1735075b3fc95b268fe9 (diff) | |
| parent | 9918419127bbace972725ced88984ad2129ae5cb (diff) | |
Merge pull request #118 from montjoie/support_2020.05
Support 2020.05
Diffstat (limited to 'lavalab-gen.py')
| -rwxr-xr-x | lavalab-gen.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lavalab-gen.py b/lavalab-gen.py index 96d25c1..a0cb89d 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -564,6 +564,7 @@ def main(): use_docker = worker["use_docker"] if use_docker: dockcomp["services"][worker_name]["volumes"].append("/var/run/docker.sock:/var/run/docker.sock") + dockcomp["services"][worker_name]["volumes"].append("/run/udev/data:/run/udev/data") # TODO permit to change the range of NBD ports use_nbd = True if "use_nbd" in worker: @@ -582,8 +583,9 @@ def main(): use_nfs = False if "use_nfs" in worker: use_nfs = worker["use_nfs"] - if use_nfs: + if use_nfs or use_docker: dockcomp["services"][worker_name]["volumes"].append("/var/lib/lava/dispatcher/tmp:/var/lib/lava/dispatcher/tmp") + if use_nfs: fp = open("%s/scripts/extra_actions" % workerdir, "a") # LAVA check if this package is installed when doing NFS jobs # So we need to install it, even if it is not used |