On 6/4/21 9:02 PM, Alper Nebi Yasak wrote:
Some sandbox-only test setups use virt-make-fs and guestmount, which
require a readable kernel to work. However, no such kernel is currently
available on the Docker container image that is used to run the tests on
CIs.
Although a previous patch adds a kernel package to the Dockerfile used
to build the container, try to explicitly install it in the CI scripts
so that it's not immediately necessary to rebuild the container for that
change.
Signed-off-by: Alper Nebi Yasak <alpernebiya...@gmail.com>
As this patch is superfluous after patch 1 I would prefer to remove it.
Tom can take care of updating the Docker image.
Best regards
Heinrich
---
.azure-pipelines.yml | 5 +++++
.gitlab-ci.yml | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 3ec396ae8905..fe82cc57feb0 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -293,6 +293,11 @@ jobs:
wget -O -
https://github.com/riscv/opensbi/releases/download/v0.9/opensbi-0.9-rv-bin.tar.xz
| tar -C /tmp -xJ;
export
OPENSBI=/tmp/opensbi-0.9-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
fi
+ if [[ "${TEST_PY_BD}" == "sandbox" ]]; then
+ sudo apt update
+ sudo apt install -y linux-image-kvm
+ sudo chmod +r /boot/vmlinu* /lib/modules/*/vmlinu* || true
+ fi
# the below corresponds to .gitlab-ci.yml "script"
cd ${WORK_DIR}
export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD};
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d072e833a3de..be3be8e045e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,11 @@ stages:
wget -O -
https://github.com/riscv/opensbi/releases/download/v0.9/opensbi-0.9-rv-bin.tar.xz
| tar -C /tmp -xJ;
export
OPENSBI=/tmp/opensbi-0.9-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
fi
+ - if [[ "${TEST_PY_BD}" == "sandbox" ]]; then
+ sudo apt update;
+ sudo apt install -y linux-image-kvm;
+ sudo chmod +r /boot/vmlinu* /lib/modules/*/vmlinu* || true;
+ fi
after_script:
- rm -rf /tmp/uboot-test-hooks /tmp/venv
