summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2020-11-04 11:00:02 -0800
committerGitHub <noreply@github.com>2020-11-04 11:00:02 -0800
commit90286d677c1a5a24c19a93256da921f899b2ed8b (patch)
tree5545fbf039d3b7c67c535764464252e35426cbd4
parentea5ae2e3cc03560683b019d9bcf78657dec35138 (diff)
parentfb95b9bb1b5dfd2721d2c5f7094a2247d8e22792 (diff)
Merge pull request #125 from montjoie/fix-2020.07
Fix 2020.07
-rw-r--r--lava-master/device-types-patch/patch-device-type.sh2
-rwxr-xr-xlavalab-gen.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/lava-master/device-types-patch/patch-device-type.sh b/lava-master/device-types-patch/patch-device-type.sh
index eb7da43..2e1a0c5 100644
--- a/lava-master/device-types-patch/patch-device-type.sh
+++ b/lava-master/device-types-patch/patch-device-type.sh
@@ -10,5 +10,7 @@ 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
+ sed -i 's,etc/dispatcher-config/device-types/,,' $patch
+ patch -p1 < $patch || exit $?
done
chown -R lavaserver:lavaserver $DEVTYPE_PATH
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 87b0cd5..66bc193 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -188,6 +188,7 @@ def main():
dockerfile.seek(0)
dockerfile.write(dockerfilec)
dockerfile.close()
+ dockcomp["services"][name]["image"] = "%s:%s" % (name, worker["version"])
if "lava-coordinator" in master and master["lava-coordinator"]:
dockcomp["services"][name]["ports"].append('3079:3079')
f_entrypoint = open("%s/entrypoint.d/02_lava-coordinator.sh" % workerdir, 'w')
@@ -468,6 +469,7 @@ def main():
dockerfile.seek(0)
dockerfile.write(dockerfilec)
dockerfile.close()
+ dockcomp["services"][name]["image"] = "%s:%s" % (name, worker["version"])
if "arch" in worker:
if worker["arch"] == 'arm64':
dockerfile = open("%s/Dockerfile" % workerdir, "r+")