.gitlab-ci.d/containers.yml | 5 ++ .gitlab-ci.yml | 30 +++++++++++ tests/docker/dockerfiles/opensuse-leap.docker | 54 +++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
v2:
Drop some package from dockerfile to make docker image more light.
v1:
Add build-system-opensuse jobs and opensuse-leap.docker dockerfile.
Use openSUSE Leap 15.2 container image in the gitlab-CI.
Signed-off-by: Cho, Yu-Chen <acho@suse.com>
---
.gitlab-ci.d/containers.yml | 5 ++
.gitlab-ci.yml | 30 +++++++++++
tests/docker/dockerfiles/opensuse-leap.docker | 54 +++++++++++++++++++
3 files changed, 89 insertions(+)
create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 892ca8d838..910754a699 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -246,3 +246,8 @@ amd64-ubuntu-container:
<<: *container_job_definition
variables:
NAME: ubuntu
+
+amd64-opensuse-leap-container:
+ <<: *container_job_definition
+ variables:
+ NAME: opensuse-leap
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0173e82b1..6a256fe07b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -195,6 +195,36 @@ acceptance-system-centos:
MAKE_CHECK_ARGS: check-acceptance
<<: *acceptance_definition
+build-system-opensuse:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: opensuse-leap
+ TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu
+ MAKE_CHECK_ARGS: check-build
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
+check-system-opensuse:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-system-opensuse
+ artifacts: true
+ variables:
+ IMAGE: opensuse-leap
+ MAKE_CHECK_ARGS: check
+
+acceptance-system-opensuse:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-system-opensuse
+ artifacts: true
+ variables:
+ IMAGE: opensuse-leap
+ MAKE_CHECK_ARGS: check-acceptance
+ <<: *acceptance_definition
+
build-disabled:
<<: *native_build_job_definition
variables:
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
new file mode 100644
index 0000000000..8b0d915bff
--- /dev/null
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -0,0 +1,54 @@
+FROM opensuse/leap:15.2
+
+# Please keep this list sorted alphabetically
+ENV PACKAGES \
+ bc \
+ brlapi-devel \
+ bzip2 \
+ cyrus-sasl-devel \
+ gcc \
+ gcc-c++ \
+ mkisofs \
+ gettext-runtime \
+ git \
+ glib2-devel \
+ glusterfs-devel \
+ libgnutls-devel \
+ gtk3-devel \
+ libaio-devel \
+ libattr-devel \
+ libcap-ng-devel \
+ libepoxy-devel \
+ libfdt-devel \
+ libiscsi-devel \
+ libjpeg8-devel \
+ libpmem-devel \
+ libpng16-devel \
+ librbd-devel \
+ libseccomp-devel \
+ libssh-devel \
+ lzo-devel \
+ make \
+ libSDL2_image-devel \
+ ncurses-devel \
+ ninja \
+ libnuma-devel \
+ perl \
+ libpixman-1-0-devel \
+ python3-base \
+ python3-virtualenv \
+ rdma-core-devel \
+ libSDL2-devel \
+ snappy-devel \
+ libspice-server-devel \
+ systemd-devel \
+ systemtap-sdt-devel \
+ usbredir-devel \
+ virglrenderer-devel \
+ xen-devel \
+ vte-devel \
+ zlib-devel
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.8
+
+RUN zypper update -y && zypper --non-interactive install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt
--
2.29.2
On 30/11/2020 05.26, Cho, Yu-Chen wrote: > v2: > Drop some package from dockerfile to make docker image more light. > > v1: > Add build-system-opensuse jobs and opensuse-leap.docker dockerfile. > Use openSUSE Leap 15.2 container image in the gitlab-CI. > > Signed-off-by: Cho, Yu-Chen <acho@suse.com> > --- > .gitlab-ci.d/containers.yml | 5 ++ > .gitlab-ci.yml | 30 +++++++++++ > tests/docker/dockerfiles/opensuse-leap.docker | 54 +++++++++++++++++++ > 3 files changed, 89 insertions(+) > create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker Hi! Sorry, I was too busy to reply last week ... you could also simply ping on the v2 that you've sent last week, but anyway, let's now continue discussion here. I gave it a try, and runtime is much better now, indeed: https://gitlab.com/huth/qemu/-/jobs/868942587 So: Tested-by: Thomas Huth <thuth@redhat.com> Patch looks also fine to me, you should just not put the version log above the "---" but below, otherwise the version log will show up in the final patch when it gets picked up with "git am". No need to resend just because of this, though, I can fix that when picking up the patch. I'll queue for my testing tree and send it once the hard freeze is over. Thomas
On 11/30/20 9:28 AM, Thomas Huth wrote: > On 30/11/2020 05.26, Cho, Yu-Chen wrote: >> v2: >> Drop some package from dockerfile to make docker image more light. >> >> v1: >> Add build-system-opensuse jobs and opensuse-leap.docker dockerfile. >> Use openSUSE Leap 15.2 container image in the gitlab-CI. >> >> Signed-off-by: Cho, Yu-Chen <acho@suse.com> >> --- >> .gitlab-ci.d/containers.yml | 5 ++ >> .gitlab-ci.yml | 30 +++++++++++ >> tests/docker/dockerfiles/opensuse-leap.docker | 54 +++++++++++++++++++ Can we have this file covered by Yu-Chen in MAINTAINERS (at least as Reviewer)? >> 3 files changed, 89 insertions(+) >> create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker > > Hi! > > Sorry, I was too busy to reply last week ... you could also simply ping on > the v2 that you've sent last week, but anyway, let's now continue discussion > here. I gave it a try, and runtime is much better now, indeed: > > https://gitlab.com/huth/qemu/-/jobs/868942587 > > So: > > Tested-by: Thomas Huth <thuth@redhat.com> > > Patch looks also fine to me, you should just not put the version log above > the "---" but below, otherwise the version log will show up in the final > patch when it gets picked up with "git am". > > No need to resend just because of this, though, I can fix that when picking > up the patch. I'll queue for my testing tree and send it once the hard > freeze is over. > > Thomas > >
On 11/30/20 5:26 AM, Cho, Yu-Chen wrote: > v2: > Drop some package from dockerfile to make docker image more light. > > v1: > Add build-system-opensuse jobs and opensuse-leap.docker dockerfile. > Use openSUSE Leap 15.2 container image in the gitlab-CI. > > Signed-off-by: Cho, Yu-Chen <acho@suse.com> > --- > .gitlab-ci.d/containers.yml | 5 ++ > .gitlab-ci.yml | 30 +++++++++++ > tests/docker/dockerfiles/opensuse-leap.docker | 54 +++++++++++++++++++ > 3 files changed, 89 insertions(+) > create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker > > diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml > index 892ca8d838..910754a699 100644 > --- a/.gitlab-ci.d/containers.yml > +++ b/.gitlab-ci.d/containers.yml > @@ -246,3 +246,8 @@ amd64-ubuntu-container: > <<: *container_job_definition > variables: > NAME: ubuntu > + > +amd64-opensuse-leap-container: > + <<: *container_job_definition > + variables: > + NAME: opensuse-leap > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index d0173e82b1..6a256fe07b 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -195,6 +195,36 @@ acceptance-system-centos: > MAKE_CHECK_ARGS: check-acceptance > <<: *acceptance_definition > What about adding in a comment who is the maintainer of these jobs? Some sort of contact in case there is a OpenSUSE specific issue for example. See: https://www.mail-archive.com/qemu-devel@nongnu.org/msg758968.html > +build-system-opensuse: > + <<: *native_build_job_definition > + variables: > + IMAGE: opensuse-leap > + TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu > + MAKE_CHECK_ARGS: check-build > + artifacts: > + expire_in: 2 days > + paths: > + - build > + > +check-system-opensuse: > + <<: *native_test_job_definition > + needs: > + - job: build-system-opensuse > + artifacts: true > + variables: > + IMAGE: opensuse-leap > + MAKE_CHECK_ARGS: check > + > +acceptance-system-opensuse: > + <<: *native_test_job_definition > + needs: > + - job: build-system-opensuse > + artifacts: true > + variables: > + IMAGE: opensuse-leap > + MAKE_CHECK_ARGS: check-acceptance > + <<: *acceptance_definition > + > build-disabled: > <<: *native_build_job_definition > variables:
On Mon, 2020-11-30 at 10:14 +0100, Philippe Mathieu-Daudé wrote: > On 11/30/20 5:26 AM, Cho, Yu-Chen wrote: > > v2: > > Drop some package from dockerfile to make docker image more light. > > > > v1: > > Add build-system-opensuse jobs and opensuse-leap.docker dockerfile. > > Use openSUSE Leap 15.2 container image in the gitlab-CI. > > > > Signed-off-by: Cho, Yu-Chen <acho@suse.com> > > --- > > .gitlab-ci.d/containers.yml | 5 ++ > > .gitlab-ci.yml | 30 +++++++++++ > > tests/docker/dockerfiles/opensuse-leap.docker | 54 > > +++++++++++++++++++ > > 3 files changed, 89 insertions(+) > > create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker > > > > diff --git a/.gitlab-ci.d/containers.yml b/.gitlab- > > ci.d/containers.yml > > index 892ca8d838..910754a699 100644 > > --- a/.gitlab-ci.d/containers.yml > > +++ b/.gitlab-ci.d/containers.yml > > @@ -246,3 +246,8 @@ amd64-ubuntu-container: > > <<: *container_job_definition > > variables: > > NAME: ubuntu > > + > > +amd64-opensuse-leap-container: > > + <<: *container_job_definition > > + variables: > > + NAME: opensuse-leap > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > index d0173e82b1..6a256fe07b 100644 > > --- a/.gitlab-ci.yml > > +++ b/.gitlab-ci.yml > > @@ -195,6 +195,36 @@ acceptance-system-centos: > > MAKE_CHECK_ARGS: check-acceptance > > <<: *acceptance_definition > > > > What about adding in a comment who is the maintainer > of these jobs? Some sort of contact in case there is > a OpenSUSE specific issue for example. > I am glad to be a maintainer or reviewer for the openSUSE specific issue. > See: > https://www.mail-archive.com/qemu-devel@nongnu.org/msg758968.html > > > +build-system-opensuse: > > + <<: *native_build_job_definition > > + variables: > > + IMAGE: opensuse-leap > > + TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu > > + MAKE_CHECK_ARGS: check-build > > + artifacts: > > + expire_in: 2 days > > + paths: > > + - build > > + > > +check-system-opensuse: > > + <<: *native_test_job_definition > > + needs: > > + - job: build-system-opensuse > > + artifacts: true > > + variables: > > + IMAGE: opensuse-leap > > + MAKE_CHECK_ARGS: check > > + > > +acceptance-system-opensuse: > > + <<: *native_test_job_definition > > + needs: > > + - job: build-system-opensuse > > + artifacts: true > > + variables: > > + IMAGE: opensuse-leap > > + MAKE_CHECK_ARGS: check-acceptance > > + <<: *acceptance_definition > > + > > build-disabled: > > <<: *native_build_job_definition > > variables:
© 2016 - 2024 Red Hat, Inc.