From a40a70ad863970eee422c0cbf2b5a27df320509b Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Thu, 12 Dec 2019 09:56:41 +0100 Subject: [PATCH] ci: Rely on latest virtiofsd version Virtio-fs maintainers recently updated the virtiofsd daemon through their official branch on Gitlab. It includes fixes that were needed for cloud-hypervisor to work correctly with it. Jenkinsfile needs to be updated since the virtiofsd build requires both libseccomp and libcap-ng to be present on the system. One thing to notice, because the latest branch introduced a change regarding libfuse behavior, the counterpart patch has been added to the custom kernel branch "virtio-fs-virtio-iommu". Fixes #536 Signed-off-by: Sebastien Boeuf --- Jenkinsfile | 2 +- scripts/run_integration_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index daabcf634..ae6822bb3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline{ stage ('Install system packages') { steps { sh "sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq build-essential mtools libssl-dev pkg-config" - sh "sudo apt-get install -yq flex bison libelf-dev qemu-utils qemu-system libglib2.0-dev libpixman-1-dev libseccomp-dev socat" + sh "sudo apt-get install -yq flex bison libelf-dev qemu-utils qemu-system libglib2.0-dev libpixman-1-dev libseccomp-dev libcap-ng-dev socat" sh "sudo snap install docker" } } diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index e9e94847c..da1c0bd33 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -91,7 +91,7 @@ VIRTIOFSD="$WORKLOADS_DIR/virtiofsd" QEMU_DIR="qemu_build" if [ ! -f "$VIRTIOFSD" ]; then pushd $WORKLOADS_DIR - git clone --depth 1 "https://github.com/sboeuf/qemu.git" -b "virtio-fs" $QEMU_DIR + git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "virtio-fs-dev" $QEMU_DIR pushd $QEMU_DIR ./configure --prefix=$PWD --target-list=x86_64-softmmu make virtiofsd -j `nproc`