Skip to content

Commit

Permalink
Fix run_integration.sh (#357)
Browse files Browse the repository at this point in the history
* Update QEMU version from 7.1.0 to 9.0.2

* Update qemu-download url

* Fix ensurepip module is not found
  • Loading branch information
toor1245 authored Aug 27, 2024
1 parent 104602c commit 947192f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake/ci/docker/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL maintainer="[email protected]"
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"]
Expand Down
2 changes: 1 addition & 1 deletion cmake/ci/docker/toolchain/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL maintainer="[email protected]"
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"]
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 947192f

Please sign in to comment.