diff options
Diffstat (limited to 'lava-slave')
| -rw-r--r-- | lava-slave/Dockerfile | 19 | ||||
| -rw-r--r-- | lava-slave/grub.cfg | 1 | ||||
| -rw-r--r-- | lava-slave/lava-coordinator/.empty | 0 | ||||
| -rwxr-xr-x | lava-slave/scripts/setup.sh | 4 |
4 files changed, 19 insertions, 5 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 32a76b0..d6375f2 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -1,8 +1,11 @@ -FROM baylibre/lava-slave-base:2018.11-1_bpo9_1 +FROM baylibre/lava-slave-base:2019.03_stretch RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu conmux +# cu conmux is for console via conmux +# telnet is for using ser2net +# git is necessary for checkout tests +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu conmux telnet git COPY configs/lava-slave /etc/lava-dispatcher/lava-slave @@ -35,7 +38,9 @@ RUN apt-get update RUN apt-get -y install lavacli # PXE stuff -RUN apt-get -y install grub-efi-amd64-bin +RUN if [ $(uname -m) != amd64 ]; then dpkg --add-architecture amd64 && apt-get update; fi +RUN apt-get -y install grub-efi-amd64-bin:amd64 +RUN if [ $(uname -m) != amd64 ]; then dpkg --remove architecture amd64 && apt-get update; fi RUN cd /var/lib/lava/dispatcher/tmp && grub-mknetdir --net-directory=. COPY grub.cfg /var/lib/lava/dispatcher/tmp/boot/grub/ @@ -44,9 +49,17 @@ COPY default/* /etc/default/ COPY phyhostname /root/ COPY scripts/setup.sh . +RUN apt-get -y install patch COPY lava-patch/ /root/lava-patch RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch) ; do patch -p1 < $patch || exit $?;done +RUN mkdir /etc/lava-coordinator/ +COPY lava-coordinator/* /etc/lava-coordinator/ +RUN if [ -e /etc/lava-coordinator/lava-coordinator.cnf ]; then DEBIAN_FRONTEND=noninteractive apt-get -y install lava-coordinator && mv /etc/lava-coordinator/lava-coordinator.cnf /etc/lava-coordinator/lava-coordinator.conf ; fi + +# needed for lavacli identities +RUN mkdir -p /root/.config + COPY devices/ /root/devices/ COPY tags/ /root/tags/ COPY deviceinfo/ /root/deviceinfo/ diff --git a/lava-slave/grub.cfg b/lava-slave/grub.cfg index e133fed..d7074b3 100644 --- a/lava-slave/grub.cfg +++ b/lava-slave/grub.cfg @@ -5,7 +5,6 @@ insmod loopback insmod iso9660 insmod all_video insmod regexp -insmod biosdisk set pager=1 # This fake menu is necessary for letting LAVA see that grub is started diff --git a/lava-slave/lava-coordinator/.empty b/lava-slave/lava-coordinator/.empty new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lava-slave/lava-coordinator/.empty diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh index e0e8322..fce01f8 100755 --- a/lava-slave/scripts/setup.sh +++ b/lava-slave/scripts/setup.sh @@ -10,6 +10,8 @@ if [ -z "$LAVA_MASTER_URI" ];then exit 11 fi +lavacli identities add --uri $LAVA_MASTER_BASEURI --token $LAVA_MASTER_TOKEN --username $LAVA_MASTER_USER default + echo "Dynamic slave for $LAVA_MASTER ($LAVA_MASTER_URI)" LAVACLIOPTS="--uri $LAVA_MASTER_URI" @@ -18,7 +20,7 @@ TIMEOUT=300 while [ $TIMEOUT -ge 1 ]; do STEP=2 - lavacli $LAVACLIOPTS device-types list 2>/dev/null >/dev/null + lavacli $LAVACLIOPTS device-types list >/dev/null if [ $? -eq 0 ];then TIMEOUT=0 else |