From 459d1bc91416c0c4f3652b314b32d12c3062a67b Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Wed, 27 Oct 2021 12:20:59 +0200 Subject: [PATCH] lkft: devices: qemu: enable docker Use qemu from the docker container instead of qemu from the lab's qemu-worker. Signed-off-by: Anders Roxell --- projects/lkft/devices/qemu_arm64 | 1 + projects/lkft/devices/qemu_i386 | 1 + projects/lkft/devices/qemu_x86_64 | 1 + 3 files changed, 3 insertions(+) diff --git a/projects/lkft/devices/qemu_arm64 b/projects/lkft/devices/qemu_arm64 index 20592914..02ea0659 100644 --- a/projects/lkft/devices/qemu_arm64 +++ b/projects/lkft/devices/qemu_arm64 @@ -12,3 +12,4 @@ {% else %} {% set QEMU_CPU_VARIABLES = QEMU_CPU_VARIABLES|default("max") %} {% endif %} +{% set USE_DOCKER = USE_DOCKER|default("true") %} diff --git a/projects/lkft/devices/qemu_i386 b/projects/lkft/devices/qemu_i386 index f03c27a9..6f23d87c 100644 --- a/projects/lkft/devices/qemu_i386 +++ b/projects/lkft/devices/qemu_i386 @@ -9,3 +9,4 @@ {% set OVERLAY_MODULES_URL_COMP = OVERLAY_MODULES_URL_COMP|default("xz") %} {% set OVERLAY_PERF_URL_FORMAT = OVERLAY_PERF_URL_FORMAT|default("tar") %} {% set OVERLAY_PERF_URL_COMP = OVERLAY_PERF_URL_COMP|default("xz") %} +{% set USE_DOCKER = USE_DOCKER|default("true") %} diff --git a/projects/lkft/devices/qemu_x86_64 b/projects/lkft/devices/qemu_x86_64 index e460f16c..fd436777 100644 --- a/projects/lkft/devices/qemu_x86_64 +++ b/projects/lkft/devices/qemu_x86_64 @@ -9,6 +9,7 @@ {% set OVERLAY_MODULES_URL_COMP = OVERLAY_MODULES_URL_COMP|default("xz") %} {% set OVERLAY_PERF_URL_FORMAT = OVERLAY_PERF_URL_FORMAT|default("tar") %} {% set OVERLAY_PERF_URL_COMP = OVERLAY_PERF_URL_COMP|default("xz") %} +{% set USE_DOCKER = USE_DOCKER|default("true") %} {% block test_target %} {% if enable_tests is defined and enable_tests %}