From 8ad0e4d715e777d9b20b4a7dd6d2cc46f25d7319 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Mon, 27 Jul 2020 11:53:55 +0200 Subject: [PATCH] ci: Move to latest virtiofsd version In order to follow the virtio-fs development, we rely on the latest development branch regarding the virtio-fs daemon. It will be now build from virtio-fs-dev branch from the virtio-fs maintainers repository. Signed-off-by: Sebastien Boeuf --- scripts/run_integration_tests_aarch64.sh | 4 ++-- scripts/run_integration_tests_x86_64.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index cd30819ab..8cfce2971 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -131,14 +131,14 @@ 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 time ./configure --prefix=$PWD --target-list=aarch64-softmmu time make virtiofsd -j `nproc` cp virtiofsd $VIRTIOFSD || exit 1 popd rm -rf $QEMU_DIR - sudo setcap cap_dac_override,cap_sys_admin+epi "virtiofsd" || exit 1 + sudo setcap cap_chown,cap_dac_override,cap_dac_read_search,cap_fowner,cap_fsetid,cap_setgid,cap_setuid,cap_mknod,cap_setfcap,cap_sys_admin+epi "virtiofsd" || exit 1 popd fi diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 201baa051..74f992c31 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -127,14 +127,14 @@ 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 time ./configure --prefix=$PWD --target-list=x86_64-softmmu time make virtiofsd -j `nproc` cp virtiofsd $VIRTIOFSD || exit 1 popd rm -rf $QEMU_DIR - sudo setcap cap_dac_override,cap_sys_admin+epi "virtiofsd" || exit 1 + sudo setcap cap_chown,cap_dac_override,cap_dac_read_search,cap_fowner,cap_fsetid,cap_setgid,cap_setuid,cap_mknod,cap_setfcap,cap_sys_admin+epi "virtiofsd" || exit 1 popd fi