Commit f4401e8e authored by Paweł Wieczorek's avatar Paweł Wieczorek
Browse files

Switch to the new default docker-compose field separator

Compose plugin is now available by default on the DinD image [0].
Version was bumped from 1.29.2 to 2.5.0. Default field separator has
been changed from '_' to '-'.

[0] https://github.com/docker-library/docker/commit/9aaa75893c70431f1302b0608af47ee26d67edf2



Signed-off-by: Paweł Wieczorek's avatarPaweł Wieczorek <pawiecz@collabora.com>
parent 0aee2e59
......@@ -24,7 +24,7 @@ docker volume rm -f collabora_lavadbdata || true
$COMPOSE up --detach lava
# Keep track of LAVA's startup
docker logs -f collabora_lava_1 &
docker logs -f collabora-lava-1 &
# We use docker to check if LAVA has finished starting since we can
# plug directly into the collabora_default network, and avoid any
......@@ -44,7 +44,7 @@ while ! $CURL -s http://lava:8000/ 2>&1 > /dev/null; do
sleep 1
done
DOCKER="docker exec collabora_lava_1"
DOCKER="docker exec collabora-lava-1"
# Pre-add user, device type, device, and device dictionary
$DOCKER lava-server manage users add lava --passwd lava
......
......@@ -10,7 +10,7 @@ fi
DOCKER="docker run --rm --network collabora_default -v lavacliconfig:/root/.config collabora-lavacli:latest"
# Set up lavacli to add the health check, device dictionary and submit the job
TOKEN=$(docker exec collabora_lava_1 lava-server manage tokens add --user lava)
TOKEN=$(docker exec collabora-lava-1 lava-server manage tokens add --user lava)
$DOCKER lavacli identities add --token "${TOKEN}" --uri http://lava:8000/RPC2 --username lava default
......@@ -22,7 +22,7 @@ echo "Job $JOB_ID started..."
# Set and run our health check
$DOCKER lavacli device-types health-check set qemu /test-health-check.yaml
docker exec collabora_lava_1 lava-server manage devices check qtest
docker exec collabora-lava-1 lava-server manage devices check qtest
echo "Health check submitted..."
check_job_result() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment