From 827810dbd5455990cc4bfbc6be85f26008ff8586 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Wed, 23 Sep 2020 17:08:45 +0200 Subject: [PATCH] ci: Fix virtiofsd build by staying on older branch While we figure out the details on how to correctly build virtiofsd from the latest rebase from the branch "virtio-fs-dev" (which now relies on QEMU's new build system), let's fix the CI by relying on an older branch which still relies on the previous build system. Signed-off-by: Sebastien Boeuf --- scripts/run_integration_tests_aarch64.sh | 2 +- scripts/run_integration_tests_x86_64.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 284e3f438..9c0c8386c 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -126,7 +126,7 @@ update_workloads() { if [ ! -f "$VIRTIOFSD" ]; then pushd $WORKLOADS_DIR - git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "virtio-fs-dev" $QEMU_DIR + git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "qemu5.0-virtiofs-dax" $QEMU_DIR pushd $QEMU_DIR time ./configure --prefix=$PWD --target-list=aarch64-softmmu time make virtiofsd -j `nproc` diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 1f2169c06..83c4a1262 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -127,7 +127,7 @@ VIRTIOFSD="$WORKLOADS_DIR/virtiofsd" QEMU_DIR="qemu_build" if [ ! -f "$VIRTIOFSD" ]; then pushd $WORKLOADS_DIR - git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "virtio-fs-dev" $QEMU_DIR + git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "qemu5.0-virtiofs-dax" $QEMU_DIR pushd $QEMU_DIR time ./configure --prefix=$PWD --target-list=x86_64-softmmu time make virtiofsd -j `nproc`