Skip to content

Commit 947192f

Browse files
authored
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
1 parent 104602c commit 947192f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cmake/ci/docker/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL maintainer="[email protected]"
66
ENV PATH=/usr/local/bin:$PATH
77
RUN apt-get update -qq \
88
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \
9-
ninja-build python3 pkgconf libglib2.0-dev \
9+
ninja-build python3 python3-venv pkgconf libglib2.0-dev \
1010
&& apt-get clean \
1111
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1212
ENTRYPOINT ["/usr/bin/bash", "-c"]

cmake/ci/docker/toolchain/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL maintainer="[email protected]"
66
ENV PATH=/usr/local/bin:$PATH
77
RUN apt-get update -qq \
88
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \
9-
ninja-build python3 pkgconf libglib2.0-dev \
9+
ninja-build python3 python3-venv pkgconf libglib2.0-dev \
1010
&& apt-get clean \
1111
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1212
ENTRYPOINT ["/usr/bin/bash", "-c"]

scripts/run_integration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function install_qemu() {
3333
>&2 echo 'QEMU is disabled !'
3434
return 0
3535
fi
36-
local -r QEMU_VERSION=${QEMU_VERSION:=7.1.0}
36+
local -r QEMU_VERSION=${QEMU_VERSION:=9.0.2}
3737
local -r QEMU_TARGET=${QEMU_ARCH}-linux-user
3838

3939
if echo "${QEMU_VERSION} ${QEMU_TARGET}" | cmp --silent "${QEMU_INSTALL}/.build" -; then
@@ -47,7 +47,7 @@ function install_qemu() {
4747
rm -rf "${QEMU_INSTALL}"
4848

4949
# Checking for a tarball before downloading makes testing easier :-)
50-
local -r QEMU_URL="http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.xz"
50+
local -r QEMU_URL="https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz"
5151
local -r QEMU_DIR="qemu-${QEMU_VERSION}"
5252
unpack ${QEMU_URL} ${QEMU_DIR}
5353
cd ${QEMU_DIR} || exit 2

0 commit comments

Comments
 (0)