diff options
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | docker-compose.template | 2 | ||||
| -rw-r--r-- | lava-master/Dockerfile | 2 | ||||
| -rwxr-xr-x | lavalab-gen.py | 8 |
4 files changed, 10 insertions, 14 deletions
@@ -90,8 +90,8 @@ So you have now: beagleboneblack-01: type: beaglebone-black uart: - idvendor: "0403" - idproduct: 6001 + idvendor: 0x0403 + idproduct: 0x6001 serial: AK04TU1X ``` @@ -108,8 +108,8 @@ So you have now: beagleboneblack-01: type: beaglebone-black uart: - idvendor: "0403" - idproduct: 6001 + idvendor: 0x0403 + idproduct: 0x6001 devpath: "1.5" ``` @@ -137,8 +137,8 @@ beagleboneblack, with FTDI (serial 1234567), connected to port 5 of an ACME power_off_command: /usr/local/bin/acme-cli -s 192.168.66.2 power_off 5 power_on_command: /usr/local/bin/acme-cli -s 192.168.66.2 power_on 5 uart: - idvendor: "0403" - idproduct: 6001 + idvendor: 0x0403 + idproduct: 0x6001 serial: 1234567 ``` diff --git a/docker-compose.template b/docker-compose.template index 87d59d3..ced5762 100644 --- a/docker-compose.template +++ b/docker-compose.template @@ -3,8 +3,6 @@ services: lava-master: hostname: lava-master restart: always - stdin_open: true - tty: true build: context: lava-master ports: diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 0f3c14b..b10351c 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -57,6 +57,8 @@ RUN a2enmod proxy \ COPY configs/tftpd-hpa /etc/default/tftpd-hpa +RUN git clone https://github.com/BayLibre/lava-healthchecks.git +RUN cp lava-healthchecks/health-checks/* /etc/lava-server/dispatcher-config/health-checks/ COPY health-checks/* /etc/lava-server/dispatcher-config/health-checks/ COPY devices/ /root/devices/ diff --git a/lavalab-gen.py b/lavalab-gen.py index f151aa1..396579e 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -3,7 +3,6 @@ from __future__ import print_function import os, sys, time import subprocess -import argparse import yaml import string import socket @@ -44,7 +43,7 @@ template_udev_devpath = string.Template("""# SUBSYSTEM=="tty", ATTRS{idVendor}=="${idvendor}", ATTRS{idProduct}=="${idproduct}", ATTRS{devpath}=="${devpath}", MODE="0664", OWNER="uucp", SYMLINK+="${board}" """) -def main(args): +def main(): fp = open(boards_yaml, "r") labs = yaml.load(fp) fp.close() @@ -193,8 +192,5 @@ def main(args): if __name__ == "__main__": shutil.copy("common/build-lava", "lava-slave/scripts/build-lava") shutil.copy("common/build-lava", "lava-master/scripts/build-lava") - parser = argparse.ArgumentParser() - parser.add_argument("--header", help="use this file as header for output file") - args = parser.parse_args() - main(args) + main() |