From 947192f9967b4578939acbc12838a8f8769b5c9d Mon Sep 17 00:00:00 2001 From: Mykola Hohsadze Date: Tue, 27 Aug 2024 12:52:26 +0300 Subject: [PATCH] Fix run_integration.sh (#357) * Update QEMU version from 7.1.0 to 9.0.2 * Update qemu-download url * Fix ensurepip module is not found --- cmake/ci/docker/amd64/Dockerfile | 2 +- cmake/ci/docker/toolchain/Dockerfile | 2 +- scripts/run_integration.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/ci/docker/amd64/Dockerfile b/cmake/ci/docker/amd64/Dockerfile index 2cc3270..3fba6b8 100644 --- a/cmake/ci/docker/amd64/Dockerfile +++ b/cmake/ci/docker/amd64/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="corentinl@google.com" ENV PATH=/usr/local/bin:$PATH RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \ - ninja-build python3 pkgconf libglib2.0-dev \ + ninja-build python3 python3-venv pkgconf libglib2.0-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT ["/usr/bin/bash", "-c"] diff --git a/cmake/ci/docker/toolchain/Dockerfile b/cmake/ci/docker/toolchain/Dockerfile index 1bf25ed..7970f18 100644 --- a/cmake/ci/docker/toolchain/Dockerfile +++ b/cmake/ci/docker/toolchain/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="corentinl@google.com" ENV PATH=/usr/local/bin:$PATH RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \ - ninja-build python3 pkgconf libglib2.0-dev \ + ninja-build python3 python3-venv pkgconf libglib2.0-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT ["/usr/bin/bash", "-c"] diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh index 053ffa9..cc9b94f 100755 --- a/scripts/run_integration.sh +++ b/scripts/run_integration.sh @@ -33,7 +33,7 @@ function install_qemu() { >&2 echo 'QEMU is disabled !' return 0 fi - local -r QEMU_VERSION=${QEMU_VERSION:=7.1.0} + local -r QEMU_VERSION=${QEMU_VERSION:=9.0.2} local -r QEMU_TARGET=${QEMU_ARCH}-linux-user if echo "${QEMU_VERSION} ${QEMU_TARGET}" | cmp --silent "${QEMU_INSTALL}/.build" -; then @@ -47,7 +47,7 @@ function install_qemu() { rm -rf "${QEMU_INSTALL}" # Checking for a tarball before downloading makes testing easier :-) - local -r QEMU_URL="http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.xz" + local -r QEMU_URL="https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz" local -r QEMU_DIR="qemu-${QEMU_VERSION}" unpack ${QEMU_URL} ${QEMU_DIR} cd ${QEMU_DIR} || exit 2