SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/docker: auto-generate ubuntu1804.docker with lcitool

Browse Source 
This commit is best examined using the "-b" option to diff.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20211215141949.3512719-11-berrange@redhat.com>
Message-Id: <20220105135009.1584676-11-alex.bennee@linaro.org>
This commit is contained in:
Daniel P. Berrangé 2022-01-05 13:49:45 +00:00 committed by Alex Bennée
parent 05e47b75cb
commit e482191643
2 changed files with 150 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tests/docker/dockerfiles/ubuntu1804.docker
View File

@ -1,5 +1,17 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile ubuntu-1804 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/ubuntu:18.04 FROM docker.io/library/ubuntu:18.04
ENV PACKAGES \
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y eatmydata && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y \
bash \
bc \ bc \
bsdmainutils \ bsdmainutils \
bzip2 \ bzip2 \
@ -50,6 +62,7 @@ ENV PACKAGES \
libnfs-dev \ libnfs-dev \
libnuma-dev \ libnuma-dev \
libpam0g-dev \ libpam0g-dev \
libpcre2-dev \
libpixman-1-dev \ libpixman-1-dev \
libpmem-dev \ libpmem-dev \
libpng-dev \ libpng-dev \
@ -60,7 +73,7 @@ ENV PACKAGES \
libsdl2-dev \ libsdl2-dev \
libsdl2-image-dev \ libsdl2-image-dev \
libseccomp-dev \ libseccomp-dev \
libselinux-dev \ libselinux1-dev \
libsnappy-dev \ libsnappy-dev \
libspice-protocol-dev \ libspice-protocol-dev \
libspice-server-dev \ libspice-server-dev \
@ -108,10 +121,26 @@ ENV PACKAGES \
tesseract-ocr-eng \ tesseract-ocr-eng \
texinfo \ texinfo \
xfslibs-dev \ xfslibs-dev \
zlib1g-dev zlib1g-dev && \
RUN apt-get update && \ eatmydata apt-get autoremove -y && \
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES eatmydata apt-get autoclean -y && \
RUN dpkg -l $PACKAGES | sort > /packages.txt sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN pip3 install \
meson==0.56.0
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3"
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
# https://bugs.launchpad.net/qemu/+bug/1838763 # https://bugs.launchpad.net/qemu/+bug/1838763
ENV QEMU_CONFIGURE_OPTS --disable-libssh ENV QEMU_CONFIGURE_OPTS --disable-libssh

7
tests/lcitool/refresh
View File

@ -60,9 +60,16 @@ def generate_dockerfile(host, target, cross=None, trailer=None):
cmd.extend([target, "qemu"]) cmd.extend([target, "qemu"])
generate(filename, cmd, trailer) generate(filename, cmd, trailer)
ubuntu1804_skipssh = [
"# https://bugs.launchpad.net/qemu/+bug/1838763\n",
"ENV QEMU_CONFIGURE_OPTS --disable-libssh\n"
]
try: try:
generate_dockerfile("centos8", "centos-8") generate_dockerfile("centos8", "centos-8")
generate_dockerfile("fedora", "fedora-35") generate_dockerfile("fedora", "fedora-35")
generate_dockerfile("ubuntu1804", "ubuntu-1804",
trailer="".join(ubuntu1804_skipssh))
sys.exit(0) sys.exit(0)
except Exception as ex: except Exception as ex: