Skip to contentSkip to conversation

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

PATCH In review Cho, Yu-Chen via 3 participants 3 messages Dec 29, 2020 – Jan 3, 2021

lore
Share & tools
lore
#0 lore raw

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

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

---
v4:
Add package tar and fix python3 version from 3.8 to 3.6 Add acceptance-system-opensuse back.

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                                | 31 +++++++++++
 tests/docker/dockerfiles/opensuse-leap.docker | 55 +++++++++++++++++++
 3 files changed, 91 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 +31 -0
index 98bff03b47..fb65a2d29c 100644
@@ -195,6 +195,37 @@ 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 +55 -0

55 lines not on this page · raw message

Signature · 1 line
2.29.2
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 87 lines · Yu-Chen

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

---
v4:
Add package tar and fix python3 version from 3.8 to 3.6 Add acceptance-system-opensuse back.

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                                | 31 +++++++++++
  tests/docker/dockerfiles/opensuse-leap.docker | 55 +++++++++++++++++++
  3 files changed, 91 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 +31 -0
index 98bff03b47..fb65a2d29c 100644
@@ -195,6 +195,37 @@ 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 +0 -0
new file mode 100644
index 0000000000..0e64893e4a

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

Quoted 3 lines
tests/docker/dockerfiles/opensuse-leap.docker new file +3 -0
@@ -0,0 +1,55 @@
+FROM opensuse/leap:15.2
+
+# Please keep this list sorted alphabetically

Except for the list of packages below not being sorted below, this version of the patch looks good to me. So,

I did some tests locally, it is working. Also on Gitlab CI all the new builds pass:

https://gitlab.com/wainersm/qemu/-/pipelines/235534062

So,

Quoted 52 lines
tests/docker/dockerfiles/opensuse-leap.docker new file +52 -0
+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 \
+    tar \
+    usbredir-devel \
+    virglrenderer-devel \
+    xen-devel \
+    vte-devel \
+    zlib-devel
+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
Tested-by on v1 1/1
#2 lore raw
In reply to Cho, Yu-Chen via
Quoted 19 lines · Yu-Chen

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

---
v4:
Add package tar and fix python3 version from 3.8 to 3.6 Add acceptance-system-opensuse back.

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.

Quoted 7 lines
---
  .gitlab-ci.d/containers.yml                   |  5 ++
  .gitlab-ci.yml                                | 31 +++++++++++
  tests/docker/dockerfiles/opensuse-leap.docker | 55 +++++++++++++++++++
  3 files changed, 91 insertions(+)

create mode 100644 tests/docker/dockerfiles/opensuse-leap.docker

Thanks, works now for me, too.

I'll queue it for my next pull request.