Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream 2023.01 #2

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lava-master/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lavasoftware/lava-server:2022.11.1
FROM lavasoftware/lava-server:2023.01

RUN apt-get update && apt-get -y install sudo git

Expand Down
3 changes: 3 additions & 0 deletions lava-master/entrypoint.d/01_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ else
sed -i "s,PASSWORD:.*,PASSWORD: '$(cat /root/pg_lava_password)'," /etc/lava-server/settings.d/00-database.yaml || exit $?
fi

cd /root/
lava-server manage makemigrations || exit $?

# verify that the backup was not already applied in case of persistent_db
if [ ! -e "/var/lib/postgresql/lava-docker.backup_done" ];then
if [ -e /root/backup/db_lavaserver.gz ];then
Expand Down
2 changes: 1 addition & 1 deletion lava-slave/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lavasoftware/lava-dispatcher:2022.11.1
FROM lavasoftware/lava-dispatcher:2023.01

RUN apt-get update

Expand Down
2 changes: 1 addition & 1 deletion lava-slave/scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ do
if [ $? -ne 0 ]; then
CURR_WORKER=""
else
CURR_WORKER=$(cat /tmp/current-worker | sed '^.* ,,')
CURR_WORKER=$(cat /tmp/current-worker | sed 's,^.* ,,')
fi
if [ ! -z "$CURR_WORKER" -a "$CURR_WORKER" != "$worker" ];then
echo "ERROR: $devicename already present on another worker $CURR_WORKER"
Expand Down
7 changes: 6 additions & 1 deletion lavalab-gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,8 @@ def main():
if use_nbd:
dockcomp["services"][name]["ports"].append("61950-62000:61950-62000")
fp = open("%s/scripts/extra_actions" % workerdir, "a")
fp.write("apt-get -y install nbd-server\n")
# LAVA issue 585 need to remove /etc/nbd-server/config
fp.write("apt-get -y install nbd-server && rm -f /etc/nbd-server/config\n")
fp.close()
os.chmod("%s/scripts/extra_actions" % workerdir, 0o755)
use_overlay_server = True
Expand Down Expand Up @@ -683,6 +684,10 @@ def main():
if devicetype == "qemu" and not use_kvm:
device_line += "{% set no_kvm = True %}\n"
if "uart" in board:
keywords_uart = [ "baud", "devpath", "idproduct", "idvendor", "interfacenum", "serial", "use_ser2net", "worker" ]
for keyword in board["uart"]:
if not keyword in keywords_uart:
print("WARNING: unknown keyword %s" % keyword)
uart = board["uart"]
baud = board["uart"].get("baud", baud_default)
idvendor = board["uart"]["idvendor"]
Expand Down