.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 24/11/2020 10.45, 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! While trying to pick up your patch, I noticed that it is failing now in the gitlab-CI: https://gitlab.com/huth/qemu/-/jobs/896384459 Could you please have a look and send a fixed v3? Thanks, Thomas
On Tue, 2020-12-08 at 07:55 +0100, Thomas Huth wrote: > On 24/11/2020 10.45, 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! > > While trying to pick up your patch, I noticed that it is failing now > in the > gitlab-CI: > > https://gitlab.com/huth/qemu/-/jobs/896384459 > > Could you please have a look and send a fixed v3? > No problem, will submit v3 soon. Cheers, AL > Thanks, > Thomas >
Hi Thomas, I try to reproduce this failed in my repo, but it seems works fine. Would you please give it a try again? I think you maybe just hit a bad point in time... Cheers, AL On Tue, 2020-12-08 at 07:55 +0100, Thomas Huth wrote: > On 24/11/2020 10.45, 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! > > While trying to pick up your patch, I noticed that it is failing now > in the > gitlab-CI: > > https://gitlab.com/huth/qemu/-/jobs/896384459 > > Could you please have a look and send a fixed v3? > > Thanks, > Thomas >
On 10/12/2020 10.32, AL Yu-Chen Cho wrote: > Hi Thomas, > > I try to reproduce this failed in my repo, but it seems works fine. > Would you please give it a try again? I think you maybe just hit a bad > point in time... I just re-tried, but it still fails for me: https://gitlab.com/huth/qemu/-/jobs/905376471 Did you also rebase your branch to the latest master version? Thomas
On 11/12/2020 14.09, Thomas Huth wrote: > On 10/12/2020 10.32, AL Yu-Chen Cho wrote: >> Hi Thomas, >> >> I try to reproduce this failed in my repo, but it seems works fine. >> Would you please give it a try again? I think you maybe just hit a bad >> point in time... > > I just re-tried, but it still fails for me: > > https://gitlab.com/huth/qemu/-/jobs/905376471 > > Did you also rebase your branch to the latest master version? I just gave it yet another try to really rule out that it was not a temporary problem, but the "acceptance" job still fails for me: https://gitlab.com/huth/qemu/-/jobs/920543768 Would it make sense to drop the "acceptance-system-opensuse" job part of the patch for now to get at least the basic compile-coverage in? Thomas
Hi Thomas, Sorry for late reply, Thomas Huth <thuth@redhat.com> 於 2020年12月18日 週五 下午7:14寫道: > > On 11/12/2020 14.09, Thomas Huth wrote: > > On 10/12/2020 10.32, AL Yu-Chen Cho wrote: > >> Hi Thomas, > >> > >> I try to reproduce this failed in my repo, but it seems works fine. > >> Would you please give it a try again? I think you maybe just hit a bad > >> point in time... > > > > I just re-tried, but it still fails for me: > > > > https://gitlab.com/huth/qemu/-/jobs/905376471 > > > > Did you also rebase your branch to the latest master version? > > I just gave it yet another try to really rule out that it was not a > temporary problem, but the "acceptance" job still fails for me: > > https://gitlab.com/huth/qemu/-/jobs/920543768 > > Would it make sense to drop the "acceptance-system-opensuse" job part of the > patch for now to get at least the basic compile-coverage in? > Yes, I tried to fix the "acceptance-system-opensuse" error but still got weird error in: VENV /builds/huth/qemu/build/tests/venv 57Error: Command '['/builds/huth/qemu/build/tests/venv/bin/python3', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. So I will submit the v3 to drop it for now, thanks a lot. Cheers, AL > Thomas > >
© 2016 - 2024 Red Hat, Inc.