diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-06-01 13:47:53 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2020-06-01 13:47:53 +0200 |
| commit | 9918419127bbace972725ced88984ad2129ae5cb (patch) | |
| tree | d566dac6b4ba30d0d66f0e4cd7ab3a5973812253 /lava-master | |
| parent | e3f6e56904164003d00833b26a3d6486afcd55e1 (diff) | |
Handle the change of device-type storage
device-types are now in /usr/share/lava-server/device-types/ and so
device-type-patch does not work anymore.
This patch support both location
Diffstat (limited to 'lava-master')
| -rw-r--r-- | lava-master/Dockerfile | 3 | ||||
| -rw-r--r-- | lava-master/device-types-patch/patch-device-type.sh | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 5b99ac5..5bf989a 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -25,8 +25,7 @@ COPY lava-patch/ /root/lava-patch RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch| sort) ; do echo $patch && patch -p1 < $patch || exit $?;done COPY device-types-patch/ /root/device-types-patch/ -RUN cd /etc/lava-server/dispatcher-config/device-types/ && for patch in $(ls /root/device-types-patch/*patch) ; do sed -i 's,lava_scheduler_app/tests/device-types/,,' $patch && echo $patch && patch < $patch || exit $?; done -RUN chown -R lavaserver:lavaserver /etc/lava-server/dispatcher-config/device-types/ +RUN sh root/device-types-patch/patch-device-type.sh COPY zmq_auth/ /etc/lava-dispatcher/certificates.d/ diff --git a/lava-master/device-types-patch/patch-device-type.sh b/lava-master/device-types-patch/patch-device-type.sh new file mode 100644 index 0000000..eb7da43 --- /dev/null +++ b/lava-master/device-types-patch/patch-device-type.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +DEVTYPE_PATH=/etc/lava-server/dispatcher-config/device-types/ +if [ -e /usr/share/lava-server/device-types/ ];then + DEVTYPE_PATH=/usr/share/lava-server/device-types/ +fi + +cd $DEVTYPE_PATH +for patch in $(ls /root/device-types-patch/*patch) +do + echo "DEBUG: patch with $patch" + sed -i 's,lava_scheduler_app/tests/device-types/,,' $patch +done +chown -R lavaserver:lavaserver $DEVTYPE_PATH |