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

tests/docker: auto-generate opensuse-leap.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-13-berrange@redhat.com>
Message-Id: <20220105135009.1584676-13-alex.bennee@linaro.org>
This commit is contained in:
Daniel P. Berrangé 2022-01-05 13:49:47 +00:00 committed by Alex Bennée
parent bb317c3258
commit 122198393d
2 changed files with 135 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/docker/dockerfiles/opensuse-leap.docker
View File

@ -1,9 +1,16 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile opensuse-leap-152 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
FROM registry.opensuse.org/opensuse/leap:15.2 FROM registry.opensuse.org/opensuse/leap:15.2
# Please keep this list sorted alphabetically RUN zypper update -y && \
ENV PACKAGES \ zypper install -y \
Mesa-devel \ Mesa-devel \
alsa-lib-devel \ alsa-lib-devel \
bash \
bc \ bc \
brlapi-devel \ brlapi-devel \
bzip2 \ bzip2 \
@ -61,6 +68,7 @@ ENV PACKAGES \
libtasn1-devel \ libtasn1-devel \
libubsan1 \ libubsan1 \
libudev-devel \ libudev-devel \
liburing-devel \
libusb-1_0-devel \ libusb-1_0-devel \
libxml2-devel \ libxml2-devel \
libzstd-devel \ libzstd-devel \
@ -74,6 +82,7 @@ ENV PACKAGES \
ninja \ ninja \
openssh \ openssh \
pam-devel \ pam-devel \
pcre-devel-static \
perl-Test-Harness \ perl-Test-Harness \
perl-base \ perl-base \
pkgconfig \ pkgconfig \
@ -107,8 +116,22 @@ ENV PACKAGES \
which \ which \
xen-devel \ xen-devel \
xfsprogs-devel \ xfsprogs-devel \
zlib-devel zlib-devel \
ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.6 zlib-devel-static && \
zypper clean --all && \
rpm -qa | sort > /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 zypper update -y && zypper --non-interactive install -y $PACKAGES RUN pip3 install \
RUN rpm -q $PACKAGES | sort > /packages.txt 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"

1
tests/lcitool/refresh
View File

@ -78,6 +78,7 @@ try:
trailer="".join(ubuntu1804_skipssh)) trailer="".join(ubuntu1804_skipssh))
generate_dockerfile("ubuntu2004", "ubuntu-2004", generate_dockerfile("ubuntu2004", "ubuntu-2004",
trailer="".join(ubuntu2004_tsanhack)) trailer="".join(ubuntu2004_tsanhack))
generate_dockerfile("opensuse-leap", "opensuse-leap-152")
sys.exit(0) sys.exit(0)
except Exception as ex: except Exception as ex:
print(str(ex), file=sys.stderr) print(str(ex), file=sys.stderr)