From: Wainer dos Santos Moschetta <wainersm@redhat.com>
To: "Cho, Yu-Chen" <acho@suse.com>, qemu-devel@nongnu.org
Cc: fam@euphon.net, lyan@suse.com, thuth@redhat.com,
philmd@redhat.com, brogers@suse.com, cfontana@suse.de,
alex.bennee@linaro.org
Subject: Re: [PATCH v3] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD
Date: Mon, 28 Dec 2020 15:02:07 -0300 [thread overview]
Message-ID: <e7954d35-3540-5230-28e8-8dd33569c95d@redhat.com> (raw)
In-Reply-To: <20201224085931.20465-1-acho@suse.com>
Hi,
On 12/24/20 5:59 AM, Cho, Yu-Chen wrote:
> 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>
> ---
> v3:
> Drop the "acceptance-system-opensuse" job part of the
> patch for now to get at least the basic compile-coverage
>
> 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.
> ---
> .gitlab-ci.d/containers.yml | 5 ++
> .gitlab-ci.yml | 20 +++++++
> tests/docker/dockerfiles/opensuse-leap.docker | 54 +++++++++++++++++++
> 3 files changed, 79 insertions(+)
> create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
On Gitlab CI this new docker file has no issues:
https://gitlab.com/wainersm/qemu/-/jobs/934243313
One test won't execute due to lack of hostname program:
https://gitlab.com/wainersm/qemu/-/jobs/934243313#L3698
Using it locally has some issues though. I can build the image as ...
$ make docker-image-opensuse-leap
... but I cannot run the test-build script as ...
$ make docker-test-build@opensuse-leap
.. and the reason is that it misses the tar program which is used to
untar the QEMU sources inside the container.
Ensuring that tar is installed wasn't enough either, I had to adjust the
path to python (/usr/bin/python3.8 doesn't exist).
So I did change:
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker
b/tests/docker/dockerfiles/opensuse-leap.docker
index 8b0d915bff..0e64893e4a 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -43,12 +43,13 @@ ENV PACKAGES \
libspice-server-devel \
systemd-devel \
systemtap-sdt-devel \
+ tar \
usbredir-devel \
virglrenderer-devel \
xen-devel \
vte-devel \
zlib-devel
-ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.8
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.6
RUN zypper update -y && zypper --non-interactive install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
>
> 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 98bff03b47..a1df981c9a 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -195,6 +195,26 @@ 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
> +
> 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
The list of packages below isn't sorted.
Thanks for contributing this!
- Wainer
> +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
next prev parent reply other threads:[~2020-12-28 18:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-24 8:59 [PATCH v3] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD Cho, Yu-Chen via
2020-12-28 18:02 ` Wainer dos Santos Moschetta [this message]
2020-12-29 8:50 ` AL Yu-Chen Cho via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e7954d35-3540-5230-28e8-8dd33569c95d@redhat.com \
--to=wainersm@redhat.com \
--cc=acho@suse.com \
--cc=alex.bennee@linaro.org \
--cc=brogers@suse.com \
--cc=cfontana@suse.de \
--cc=fam@euphon.net \
--cc=lyan@suse.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).