Skip to contentSkip to conversation

gitlab-ci.yml: Add openSUSE Tumbleweed and Leap for gitlab CI/CD

PATCH In review Yu-Chen, Cho 6 participants 15 messages Nov 16, 2020 – Dec 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gitlab-ci.yml: Add openSUSE Tumbleweed and Leap for gitlab CI/CD

Add build-system-opensusetw and build-system-opensuse152 jobs and add opensuse152.docker and opensusetw.docker dockerfile. Use openSUSE Tumbleweed and openSUSE Leap 15.2 container image in the gitlab-CI.

---
 .gitlab-ci.d/containers.yml                 | 10 +++
 .gitlab-ci.yml                              | 60 ++++++++++++++
 tests/docker/dockerfiles/opensuse152.docker | 88 ++++++++++++++++++++
 tests/docker/dockerfiles/opensusetw.docker  | 89 +++++++++++++++++++++
 4 files changed, 247 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse152.docker
 create mode 100644 tests/docker/dockerfiles/opensusetw.docker
.gitlab-ci.d/containers.yml +10 -0
index 11d079ea58..449a00de70 100644
@@ -48,6 +48,16 @@ amd64-debian11-container:
   variables:
     NAME: debian11
 
+amd64-opensuseTW-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensusetw
+
+amd64-opensuse152-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse152
+
 alpha-debian-cross-container:
   <<: *container_job_definition
   stage: containers-layer2
.gitlab-ci.yml +60 -0

66 lines not on this page · raw message

tests/docker/dockerfiles/opensuse152.docker new file +88 -0

88 lines not on this page · raw message

tests/docker/dockerfiles/opensusetw.docker new file +89 -0

89 lines not on this page · raw message

Signature · 1 line
2.29.1
#1 lore raw
Quoted 6 lines · Cho

Add build-system-opensusetw and build-system-opensuse152 jobs and add opensuse152.docker and opensusetw.docker dockerfile. Use openSUSE Tumbleweed and openSUSE Leap 15.2 container image in the gitlab-CI.

Hi,

Could you split the TW and the Leap patches please as they are adding distinct things.

I'm not super familiar with openSUSE LEAP but I assume this is in the same category of short lived "tip" distros as Fedora and non LTS Ubuntu? In which case we should name it as such (opensuse-leap?) as we will tick the build version each time a new version comes out.

I'm less sure about Tumbleweed because I don't think we make any commitment to support rolling distros. We don't have Gentoo, Arch or Debian Testing* in our dockerfiles either. I would expect rolling distros to track the upstream build themselves.

* Debian 11 (next stable is there purely for compiling test cases)

Quoted 38 lines
---
 .gitlab-ci.d/containers.yml                 | 10 +++
 .gitlab-ci.yml                              | 60 ++++++++++++++
 tests/docker/dockerfiles/opensuse152.docker | 88 ++++++++++++++++++++
 tests/docker/dockerfiles/opensusetw.docker  | 89 +++++++++++++++++++++
 4 files changed, 247 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse152.docker
 create mode 100644 tests/docker/dockerfiles/opensusetw.docker
.gitlab-ci.d/containers.yml +10 -0
index 11d079ea58..449a00de70 100644
@@ -48,6 +48,16 @@ amd64-debian11-container:
   variables:
     NAME: debian11
 
+amd64-opensuseTW-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensusetw
+
+amd64-opensuse152-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse152
+
 alpha-debian-cross-container:
   <<: *container_job_definition
   stage: containers-layer2
.gitlab-ci.yml +0 -0
index 9a8b375188..540a700596 100644
@@ -195,6 +195,66 @@ acceptance-system-centos:
     MAKE_CHECK_ARGS: check-acceptance
   <<: *acceptance_definition
 

<snip>

Quoted 21 lines
.gitlab-ci.yml +21 -0
+
+build-system-opensuse152:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: opensuse152
+    TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu
+    MAKE_CHECK_ARGS: check-build
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build
+
+check-system-opensuse152:
+  <<: *native_test_job_definition
+  needs:
+    - job: build-system-opensuse152
+      artifacts: true
+  variables:
+    IMAGE: opensuse152
+    MAKE_CHECK_ARGS: check
+

.gitlab-ci.yml acceptance-system-centos: · line 257

Quoted 10 lines
.gitlab-ci.yml +10 -0
+acceptance-system-opensuse152:
+  <<: *native_test_job_definition
+  needs:
+    - job: build-system-opensuse152
+      artifacts: true
+  variables:
+    IMAGE: opensuse152
+    MAKE_CHECK_ARGS: check-acceptance
+  <<: *acceptance_definition
+

What's the thinking about this selection of TARGETS and tests? We've tried to spread the various configure, TARGETS and CHECK combinations across all the distros to avoid too much repetition of what is mostly the same code being tested.

Signature · 1 line
Alex Bennée
#2 lore raw

Hi,

Quoted 8 lines · Alex Bennée
Quoted 6 lines · Cho

Add build-system-opensusetw and build-system-opensuse152 jobs and add opensuse152.docker and opensusetw.docker dockerfile. Use openSUSE Tumbleweed and openSUSE Leap 15.2 container image in the
gitlab-CI.

Quoted 7 lines
Quoted 1 line

Hi,

Could you split the TW and the Leap patches please as they are adding distinct things.

ok, no problem, I will send it again only for openSUSE Leap.

Quoted 7 lines

I'm not super familiar with openSUSE LEAP but I assume this is in the same category of short lived "tip" distros as Fedora and non LTS Ubuntu?
In which case we should name it as such (opensuse-leap?) as we will tick
the build version each time a new version comes out.

Quoted 5 lines

I'm less sure about Tumbleweed because I don't think we make any commitment to support rolling distros. We don't have Gentoo, Arch or Debian Testing* in our dockerfiles either. I would expect rolling distros to track the upstream build themselves.

Yes, I got it, thanks for your suggestion.

Cheers,
AL

Quoted 81 lines

* Debian 11 (next stable is there purely for compiling test cases)

Quoted 41 lines
---
 .gitlab-ci.d/containers.yml                 | 10 +++
 .gitlab-ci.yml                              | 60 ++++++++++++++
 tests/docker/dockerfiles/opensuse152.docker | 88
++++++++++++++++++++
 tests/docker/dockerfiles/opensusetw.docker  | 89
+++++++++++++++++++++
 4 files changed, 247 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse152.docker
 create mode 100644 tests/docker/dockerfiles/opensusetw.docker
.gitlab- renamed from .gitlab-ci.d/containers.yml +0 -0

ci.d/containers.yml
index 11d079ea58..449a00de70 100644

.gitlab-ci.d/containers.yml +10 -0
@@ -48,6 +48,16 @@ amd64-debian11-container:
   variables:
     NAME: debian11
 
+amd64-opensuseTW-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensusetw
+
+amd64-opensuse152-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse152
+
 alpha-debian-cross-container:
   <<: *container_job_definition
   stage: containers-layer2
.gitlab-ci.yml +0 -0
index 9a8b375188..540a700596 100644
@@ -195,6 +195,66 @@ acceptance-system-centos:
     MAKE_CHECK_ARGS: check-acceptance
   <<: *acceptance_definition
 

<snip>

Quoted 21 lines
.gitlab-ci.yml +21 -0
+
+build-system-opensuse152:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: opensuse152
+    TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu
+    MAKE_CHECK_ARGS: check-build
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build
+
+check-system-opensuse152:
+  <<: *native_test_job_definition
+  needs:
+    - job: build-system-opensuse152
+      artifacts: true
+  variables:
+    IMAGE: opensuse152
+    MAKE_CHECK_ARGS: check
+

.gitlab-ci.yml acceptance-system-centos: · line 257

Quoted 10 lines
.gitlab-ci.yml +10 -0
+acceptance-system-opensuse152:
+  <<: *native_test_job_definition
+  needs:
+    - job: build-system-opensuse152
+      artifacts: true
+  variables:
+    IMAGE: opensuse152
+    MAKE_CHECK_ARGS: check-acceptance
+  <<: *acceptance_definition
+

What's the thinking about this selection of TARGETS and tests? We've tried to spread the various configure, TARGETS and CHECK combinations across all the distros to avoid too much repetition of what is mostly the same code being tested.

#3 lore raw

PATCH 1/1 gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

In reply to Yu-Chen, Cho

Add build-system-opensuse jobs and add opensuse-leap.docker dockerfile. Use openSUSE Leap 15.2 container image in the gitlab-CI.

---
 .gitlab-ci.d/containers.yml                   |  5 ++
 .gitlab-ci.yml                                | 30 +++++++
 tests/docker/dockerfiles/opensuse-leap.docker | 88 +++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
.gitlab-ci.d/containers.yml +5 -0
index 11d079ea58..082624a6fa 100644
@@ -246,3 +246,8 @@ amd64-ubuntu-container:
   <<: *container_job_definition
   variables:
     NAME: ubuntu
+
+amd64-opensuse-leap-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse-leap
.gitlab-ci.yml +30 -0
index 9a8b375188..bf4759296a 100644
@@ -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:
tests/docker/dockerfiles/opensuse-leap.docker new file +88 -0

88 lines not on this page · raw message

Signature · 1 line
2.29.2
#4 lore raw

Re: [PATCH] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Quoted 149 lines · Yu-Chen

Add build-system-opensuse jobs and add opensuse-leap.docker dockerfile. Use openSUSE Leap 15.2 container image in the gitlab-CI.

---
 .gitlab-ci.d/containers.yml                   |  5 ++
 .gitlab-ci.yml                                | 30 +++++++
 tests/docker/dockerfiles/opensuse-leap.docker | 88 +++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
.gitlab-ci.d/containers.yml +5 -0
index 11d079ea58..082624a6fa 100644
@@ -246,3 +246,8 @@ amd64-ubuntu-container:
   <<: *container_job_definition
   variables:
     NAME: ubuntu
+
+amd64-opensuse-leap-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse-leap
.gitlab-ci.yml +30 -0
index 9a8b375188..bf4759296a 100644
@@ -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:
tests/docker/dockerfiles/opensuse-leap.docker new file +78 -0
new file mode 100644
index 0000000000..712eb4fe3a
@@ -0,0 +1,88 @@
+FROM opensuse/leap:15.2
+
+RUN zypper update -y
+
+# Please keep this list sorted alphabetically
+ENV PACKAGES \
+    bc \
+    brlapi-devel \
+    bzip2 \
+    libzip-devel \
+    ccache \
+    clang \
+    cyrus-sasl-devel \
+    dbus-1 \
+    device-mapper-devel \
+    gcc \
+    gcc-c++ \
+    mkisofs \
+    gettext-runtime \
+    git \
+    glib2-devel \
+    glusterfs-devel \
+    libgnutls-devel \
+    gtk3-devel \
+    hostname \
+    libaio-devel \
+    libasan5 \
+    libattr-devel \
+    libblockdev-devel \
+    libcap-ng-devel \
+    libcurl-devel \
+    libepoxy-devel \
+    libfdt-devel \
+    libiscsi-devel \
+    libjpeg8-devel \
+    libpmem-devel \
+    libpng16-devel \
+    librbd-devel \
+    libseccomp-devel \
+    libssh-devel \
+    libubsan0 \
+    libudev-devel \
+    libxml2-devel \
+    libzstd-devel \
+    llvm \
+    lzo-devel \
+    make \
+    mingw32-filesystem \
+    glibc-devel-32bit \
+    libSDL2_image-devel \
+    mingw64-binutils \
+    nmap \
+    ncat \
+    ncurses-devel \
+    libnettle-devel \
+    ninja \
+    mozilla-nss-devel \
+    libnuma-devel \
+    perl \
+    libpixman-1-0-devel \
+    python3-base \
+    python3-PyYAML \
+    python3-numpy \
+    python3-opencv \
+    python3-Pillow \
+    python3-pip \
+    python3-Sphinx \
+    python3-virtualenv \
+    rdma-core-devel \
+    libSDL2-devel \
+    snappy-devel \
+    sparse \
+    libspice-server-devel \
+    systemd-devel \
+    systemtap-sdt-devel \
+    tar \
+    tesseract-ocr \
+    tesseract-ocr-traineddata-english \

tests/docker/dockerfiles/opensuse-leap.docker line 88

Quoted 10 lines
tests/docker/dockerfiles/opensuse-leap.docker new file +10 -0
+    usbredir-devel \
+    virglrenderer-devel \
+    libvte-2_91-0 \
+    which \
+    xen-devel \
+    zlib-devel
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.8
+
+RUN zypper  --non-interactive install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt

Thanks, I gave it a try now and it seems to work fine so far ... but the initial creation of the container was quite slow, 28 minutes, that's quite a bit more from what I've seen with the other containers so far:

https://gitlab.com/huth/qemu/-/jobs/853630446

(other containers took e.g. only 10 minutes like
https://gitlab.com/huth/qemu/-/jobs/853630446 or 15 minutes like
https://gitlab.com/qemu-project/qemu/-/jobs/812284100)

Did I maybe just hit a bad point in time?

Or would it make sense to trim the list of packages that need to be installed?

For example, unless you want to test m68k-softmmu in this container, too, you don't need tesseract-ocr.

And why do you need mozilla-nss-devel ?

And I think you could also drop the mingw packages for now, unless you want to cross-compile some Windows binaries with this container?

Also, do we need clang/llvm in here? sparse? nmap? glibc-devel-32bit? libzip-devel?

And why is there libvte-2_91-0, but no libvte-2_91-devel ?

I think at least some of those packages could be dropped, indeed.

Thomas

#5 lore raw

Re: [PATCH] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Quoted 171 lines · Thomas Huth
Quoted 153 lines · Yu-Chen

Add build-system-opensuse jobs and add opensuse-leap.docker dockerfile.
Use openSUSE Leap 15.2 container image in the gitlab-CI.

---
 .gitlab-ci.d/containers.yml                   |  5 ++
 .gitlab-ci.yml                                | 30 +++++++
 tests/docker/dockerfiles/opensuse-leap.docker | 88
+++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
.gitlab- renamed from .gitlab-ci.d/containers.yml +0 -0

ci.d/containers.yml
index 11d079ea58..082624a6fa 100644

.gitlab-ci.d/containers.yml +5 -0
@@ -246,3 +246,8 @@ amd64-ubuntu-container:
   <<: *container_job_definition
   variables:
     NAME: ubuntu
+
+amd64-opensuse-leap-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse-leap
.gitlab-ci.yml +30 -0
index 9a8b375188..bf4759296a 100644
@@ -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:
tests/docker/dockerfiles/opensuse-leap.docker new file +78 -0
new file mode 100644
index 0000000000..712eb4fe3a
@@ -0,0 +1,88 @@
+FROM opensuse/leap:15.2
+
+RUN zypper update -y
+
+# Please keep this list sorted alphabetically
+ENV PACKAGES \
+    bc \
+    brlapi-devel \
+    bzip2 \
+    libzip-devel \
+    ccache \
+    clang \
+    cyrus-sasl-devel \
+    dbus-1 \
+    device-mapper-devel \
+    gcc \
+    gcc-c++ \
+    mkisofs \
+    gettext-runtime \
+    git \
+    glib2-devel \
+    glusterfs-devel \
+    libgnutls-devel \
+    gtk3-devel \
+    hostname \
+    libaio-devel \
+    libasan5 \
+    libattr-devel \
+    libblockdev-devel \
+    libcap-ng-devel \
+    libcurl-devel \
+    libepoxy-devel \
+    libfdt-devel \
+    libiscsi-devel \
+    libjpeg8-devel \
+    libpmem-devel \
+    libpng16-devel \
+    librbd-devel \
+    libseccomp-devel \
+    libssh-devel \
+    libubsan0 \
+    libudev-devel \
+    libxml2-devel \
+    libzstd-devel \
+    llvm \
+    lzo-devel \
+    make \
+    mingw32-filesystem \
+    glibc-devel-32bit \
+    libSDL2_image-devel \
+    mingw64-binutils \
+    nmap \
+    ncat \
+    ncurses-devel \
+    libnettle-devel \
+    ninja \
+    mozilla-nss-devel \
+    libnuma-devel \
+    perl \
+    libpixman-1-0-devel \
+    python3-base \
+    python3-PyYAML \
+    python3-numpy \
+    python3-opencv \
+    python3-Pillow \
+    python3-pip \
+    python3-Sphinx \
+    python3-virtualenv \
+    rdma-core-devel \
+    libSDL2-devel \
+    snappy-devel \
+    sparse \
+    libspice-server-devel \
+    systemd-devel \
+    systemtap-sdt-devel \
+    tar \
+    tesseract-ocr \
+    tesseract-ocr-traineddata-english \

tests/docker/dockerfiles/opensuse-leap.docker line 88

Quoted 10 lines
tests/docker/dockerfiles/opensuse-leap.docker new file +10 -0
+    usbredir-devel \
+    virglrenderer-devel \
+    libvte-2_91-0 \
+    which \
+    xen-devel \
+    zlib-devel
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.8
+
+RUN zypper  --non-interactive install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt

Thanks, I gave it a try now and it seems to work fine so far ... but the
initial creation of the container was quite slow, 28 minutes, that's quite a
bit more from what I've seen with the other containers so far:

Quoted 8 lines

https://gitlab.com/huth/qemu/-/jobs/853630446

(other containers took e.g. only 10 minutes like
https://gitlab.com/huth/qemu/-/jobs/853630446 or 15 minutes like
https://gitlab.com/qemu-project/qemu/-/jobs/812284100)

Did I maybe just hit a bad point in time?

No, Thanks for your suggestion, I think I can decrease the docker build duration.

Quoted 2 lines

Or would it make sense to trim the list of packages that need to be installed?

yes, I already started to trim, will submit v2 sson.

Quoted 11 lines

For example, unless you want to test m68k-softmmu in this container, too,
you don't need tesseract-ocr.

And why do you need mozilla-nss-devel ?

And I think you could also drop the mingw packages for now, unless you want
to cross-compile some Windows binaries with this container?

yes, no problem. The origin plan is add some cross-compiler after this patch, and that I am not sure which one way to add it is that best ( and that would not use the resource to create the docker image again. but I think I should patch it later.

Quoted 5 lines

Also, do we need clang/llvm in here? sparse? nmap? glibc-devel-32bit? libzip-devel?

And why is there libvte-2_91-0, but no libvte-2_91-devel ?

yes, it's wrong, that should be vte-devel.

Quoted 2 lines

I think at least some of those packages could be dropped, indeed.

Yes, I'm not so familiar with gitlab CI/CD, but I will modify the dockerfile to fit the processes, thanks a lot for your suggestion and comments.

Cheers,
AL

#6 lore raw

Re: [PATCH] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Quoted 202 lines · AL Yu-Chen Cho
Quoted 171 lines · Thomas Huth
Quoted 153 lines · Yu-Chen

Add build-system-opensuse jobs and add opensuse-leap.docker dockerfile.
Use openSUSE Leap 15.2 container image in the gitlab-CI.

---
 .gitlab-ci.d/containers.yml                   |  5 ++
 .gitlab-ci.yml                                | 30 +++++++
 tests/docker/dockerfiles/opensuse-leap.docker | 88
+++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
.gitlab- renamed from .gitlab-ci.d/containers.yml +0 -0

ci.d/containers.yml
index 11d079ea58..082624a6fa 100644

.gitlab-ci.d/containers.yml +5 -0
@@ -246,3 +246,8 @@ amd64-ubuntu-container:
   <<: *container_job_definition
   variables:
     NAME: ubuntu
+
+amd64-opensuse-leap-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse-leap
.gitlab-ci.yml +30 -0
index 9a8b375188..bf4759296a 100644
@@ -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:
tests/docker/dockerfiles/opensuse-leap.docker new file +78 -0
new file mode 100644
index 0000000000..712eb4fe3a
@@ -0,0 +1,88 @@
+FROM opensuse/leap:15.2
+
+RUN zypper update -y
+
+# Please keep this list sorted alphabetically
+ENV PACKAGES \
+    bc \
+    brlapi-devel \
+    bzip2 \
+    libzip-devel \
+    ccache \
+    clang \
+    cyrus-sasl-devel \
+    dbus-1 \
+    device-mapper-devel \
+    gcc \
+    gcc-c++ \
+    mkisofs \
+    gettext-runtime \
+    git \
+    glib2-devel \
+    glusterfs-devel \
+    libgnutls-devel \
+    gtk3-devel \
+    hostname \
+    libaio-devel \
+    libasan5 \
+    libattr-devel \
+    libblockdev-devel \
+    libcap-ng-devel \
+    libcurl-devel \
+    libepoxy-devel \
+    libfdt-devel \
+    libiscsi-devel \
+    libjpeg8-devel \
+    libpmem-devel \
+    libpng16-devel \
+    librbd-devel \
+    libseccomp-devel \
+    libssh-devel \
+    libubsan0 \
+    libudev-devel \
+    libxml2-devel \
+    libzstd-devel \
+    llvm \
+    lzo-devel \
+    make \
+    mingw32-filesystem \
+    glibc-devel-32bit \
+    libSDL2_image-devel \
+    mingw64-binutils \
+    nmap \
+    ncat \
+    ncurses-devel \
+    libnettle-devel \
+    ninja \
+    mozilla-nss-devel \
+    libnuma-devel \
+    perl \
+    libpixman-1-0-devel \
+    python3-base \
+    python3-PyYAML \
+    python3-numpy \
+    python3-opencv \
+    python3-Pillow \
+    python3-pip \
+    python3-Sphinx \
+    python3-virtualenv \
+    rdma-core-devel \
+    libSDL2-devel \
+    snappy-devel \
+    sparse \
+    libspice-server-devel \
+    systemd-devel \
+    systemtap-sdt-devel \
+    tar \
+    tesseract-ocr \
+    tesseract-ocr-traineddata-english \

tests/docker/dockerfiles/opensuse-leap.docker line 88

Quoted 10 lines
tests/docker/dockerfiles/opensuse-leap.docker new file +10 -0
+    usbredir-devel \
+    virglrenderer-devel \
+    libvte-2_91-0 \
+    which \
+    xen-devel \
+    zlib-devel
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.8
+
+RUN zypper  --non-interactive install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt

Thanks, I gave it a try now and it seems to work fine so far ... but the
initial creation of the container was quite slow, 28 minutes, that's quite a
bit more from what I've seen with the other containers so far:

Quoted 8 lines

https://gitlab.com/huth/qemu/-/jobs/853630446

(other containers took e.g. only 10 minutes like
https://gitlab.com/huth/qemu/-/jobs/853630446 or 15 minutes like
https://gitlab.com/qemu-project/qemu/-/jobs/812284100)

Did I maybe just hit a bad point in time?

No, Thanks for your suggestion, I think I can decrease the docker build duration.

Quoted 2 lines

Or would it make sense to trim the list of packages that need to be installed?

yes, I already started to trim, will submit v2 sson.

Quoted 11 lines

For example, unless you want to test m68k-softmmu in this container, too,
you don't need tesseract-ocr.

And why do you need mozilla-nss-devel ?

And I think you could also drop the mingw packages for now, unless you want
to cross-compile some Windows binaries with this container?

Quoted 4 lines

yes, no problem. The origin plan is add some cross-compiler after this patch, and that I am not sure which one way to add it is that best ( and that would not use the resource to create the docker image again. but I think I should patch it later.

We already have cross compiler testing with the Fedora (mingw) and Debian images (non-x86 linux). I don't think we want to add more cross compiler stuff if it just duplicating coverage we already haev.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#7 lore raw

Re: [PATCH] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

In reply to AL Yu-Chen Cho
Quoted 202 lines · AL Yu-Chen Cho
Quoted 171 lines · Thomas Huth
Quoted 153 lines · Yu-Chen

Add build-system-opensuse jobs and add opensuse-leap.docker dockerfile.
Use openSUSE Leap 15.2 container image in the gitlab-CI.

---
 .gitlab-ci.d/containers.yml                   |  5 ++
 .gitlab-ci.yml                                | 30 +++++++
 tests/docker/dockerfiles/opensuse-leap.docker | 88
+++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
.gitlab- renamed from .gitlab-ci.d/containers.yml +0 -0

ci.d/containers.yml
index 11d079ea58..082624a6fa 100644

.gitlab-ci.d/containers.yml +5 -0
@@ -246,3 +246,8 @@ amd64-ubuntu-container:
   <<: *container_job_definition
   variables:
     NAME: ubuntu
+
+amd64-opensuse-leap-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse-leap
.gitlab-ci.yml +30 -0
index 9a8b375188..bf4759296a 100644
@@ -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:
tests/docker/dockerfiles/opensuse-leap.docker new file +78 -0
new file mode 100644
index 0000000000..712eb4fe3a
@@ -0,0 +1,88 @@
+FROM opensuse/leap:15.2
+
+RUN zypper update -y
+
+# Please keep this list sorted alphabetically
+ENV PACKAGES \
+    bc \
+    brlapi-devel \
+    bzip2 \
+    libzip-devel \
+    ccache \
+    clang \
+    cyrus-sasl-devel \
+    dbus-1 \
+    device-mapper-devel \
+    gcc \
+    gcc-c++ \
+    mkisofs \
+    gettext-runtime \
+    git \
+    glib2-devel \
+    glusterfs-devel \
+    libgnutls-devel \
+    gtk3-devel \
+    hostname \
+    libaio-devel \
+    libasan5 \
+    libattr-devel \
+    libblockdev-devel \
+    libcap-ng-devel \
+    libcurl-devel \
+    libepoxy-devel \
+    libfdt-devel \
+    libiscsi-devel \
+    libjpeg8-devel \
+    libpmem-devel \
+    libpng16-devel \
+    librbd-devel \
+    libseccomp-devel \
+    libssh-devel \
+    libubsan0 \
+    libudev-devel \
+    libxml2-devel \
+    libzstd-devel \
+    llvm \
+    lzo-devel \
+    make \
+    mingw32-filesystem \
+    glibc-devel-32bit \
+    libSDL2_image-devel \
+    mingw64-binutils \
+    nmap \
+    ncat \
+    ncurses-devel \
+    libnettle-devel \
+    ninja \
+    mozilla-nss-devel \
+    libnuma-devel \
+    perl \
+    libpixman-1-0-devel \
+    python3-base \
+    python3-PyYAML \
+    python3-numpy \
+    python3-opencv \
+    python3-Pillow \
+    python3-pip \
+    python3-Sphinx \
+    python3-virtualenv \
+    rdma-core-devel \
+    libSDL2-devel \
+    snappy-devel \
+    sparse \
+    libspice-server-devel \
+    systemd-devel \
+    systemtap-sdt-devel \
+    tar \
+    tesseract-ocr \
+    tesseract-ocr-traineddata-english \

tests/docker/dockerfiles/opensuse-leap.docker line 88

Quoted 10 lines
tests/docker/dockerfiles/opensuse-leap.docker new file +10 -0
+    usbredir-devel \
+    virglrenderer-devel \
+    libvte-2_91-0 \
+    which \
+    xen-devel \
+    zlib-devel
+ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.8
+
+RUN zypper  --non-interactive install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt

Thanks, I gave it a try now and it seems to work fine so far ... but the
initial creation of the container was quite slow, 28 minutes, that's quite a
bit more from what I've seen with the other containers so far:

Quoted 8 lines

https://gitlab.com/huth/qemu/-/jobs/853630446

(other containers took e.g. only 10 minutes like
https://gitlab.com/huth/qemu/-/jobs/853630446 or 15 minutes like
https://gitlab.com/qemu-project/qemu/-/jobs/812284100)

Did I maybe just hit a bad point in time?

No, Thanks for your suggestion, I think I can decrease the docker build duration.

Quoted 2 lines

Or would it make sense to trim the list of packages that need to be installed?

yes, I already started to trim, will submit v2 sson.

Quoted 11 lines

For example, unless you want to test m68k-softmmu in this container, too,
you don't need tesseract-ocr.

And why do you need mozilla-nss-devel ?

And I think you could also drop the mingw packages for now, unless you want
to cross-compile some Windows binaries with this container?

Quoted 4 lines

yes, no problem. The origin plan is add some cross-compiler after this patch, and that I am not sure which one way to add it is that best ( and that would not use the resource to create the docker image again. but I think I should patch it later.

I'd keep the focus on building the specific OpenSUSE binaries. We have pretty good cross compiler support from Debian already so unless OpenSUSE packages some architectures we don't already have covered then I would suggest keeping it light. Even in the Debian case we layer the images so each cross compiler shares a common light base and not a full featured build everything image.

Signature · 1 line
Alex Bennée
#8 lore raw

PATCH v2 1/1 gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

In reply to Yu-Chen, Cho

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                                | 30 +++++++++++
 tests/docker/dockerfiles/opensuse-leap.docker | 54 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker
.gitlab-ci.d/containers.yml +5 -0
index 892ca8d838..910754a699 100644
@@ -246,3 +246,8 @@ amd64-ubuntu-container:
   <<: *container_job_definition
   variables:
     NAME: ubuntu
+
+amd64-opensuse-leap-container:
+  <<: *container_job_definition
+  variables:
+    NAME: opensuse-leap
.gitlab-ci.yml +30 -0
index d0173e82b1..6a256fe07b 100644
@@ -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:
tests/docker/dockerfiles/opensuse-leap.docker new file +54 -0

54 lines not on this page · raw message

Signature · 1 line
2.29.2
#9 lore raw

Re: [PATCH v2] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Quoted 7 lines · Yu-Chen

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.

Quoted 7 lines
---
 .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

#10 lore raw

Re: [PATCH v2] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Quoted 19 lines · Thomas Huth
Quoted 7 lines · Yu-Chen

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.

Quoted 8 lines

---
 .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!

Quoted 8 lines

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

Quoted 3 lines

 Thanks,
  Thomas

#11 lore raw

Re: [PATCH v2] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

In reply to Thomas Huth

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

Quoted 30 lines · Thomas Huth
Quoted 7 lines · Yu-Chen

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.

Quoted 8 lines

---
 .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

#12 lore raw

Re: [PATCH v2] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Quoted 5 lines · AL Yu-Chen Cho

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

#13 lore raw

Re: [PATCH v2] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Quoted 7 lines · Thomas Huth
Quoted 5 lines · AL Yu-Chen Cho

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...

Quoted 5 lines

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

#14 lore raw

Re: [PATCH v2] gitlab-ci.yml: Add openSUSE Leap 15.2 for gitlab CI/CD

Hi Thomas,

Sorry for late reply,

Thomas Huth <[email protected]> 於 2020年12月18日 週五 下午7:14寫道:

Quoted 15 lines · Thomas Huth
Quoted 7 lines · AL Yu-Chen Cho
Quoted 5 lines

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...

Quoted 5 lines

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?

Quoted 8 lines

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

Quoted 3 lines

Thomas