From 8a11ef5ba6b078a3078abea593feb9d21abce92e Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Wed, 23 Sep 2020 18:41:08 +0200 Subject: [PATCH] ci: Move back to latest virtiofsd version This commit moves back to the branch "virtio-fs-dev" from virtiofsd, as we figured the changes needed to use this branch and the requirements from the new meson build from QEMU. It updates the container version to ensure the dev_cli.sh script will rely on the latest container which contains the needed packages. Signed-off-by: Sebastien Boeuf --- scripts/dev_cli.sh | 2 +- scripts/run_integration_tests_aarch64.sh | 6 +++--- scripts/run_integration_tests_x86_64.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh index 36d481786..ed9da1c59 100755 --- a/scripts/dev_cli.sh +++ b/scripts/dev_cli.sh @@ -7,7 +7,7 @@ CLI_NAME="Cloud Hypervisor" CTR_IMAGE_TAG="cloudhypervisor/dev" -CTR_IMAGE_VERSION="v4" +CTR_IMAGE_VERSION="latest" CTR_IMAGE="${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}" DOCKER_RUNTIME="docker" diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index 9c0c8386c..f3522c78b 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -126,11 +126,11 @@ update_workloads() { if [ ! -f "$VIRTIOFSD" ]; then pushd $WORKLOADS_DIR - git clone --depth 1 "https://gitlab.com/virtio-fs/qemu.git" -b "qemu5.0-virtiofs-dax" $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 + time make -j `nproc` + cp build/tools/virtiofsd/virtiofsd $VIRTIOFSD || exit 1 popd rm -rf $QEMU_DIR 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 diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 83c4a1262..d578dec51 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -127,11 +127,11 @@ 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 "qemu5.0-virtiofs-dax" $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 + time make -j `nproc` + cp build/tools/virtiofsd/virtiofsd $VIRTIOFSD || exit 1 popd rm -rf $QEMU_DIR 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