Skip to contentSkip to conversation

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

PATCH In review Cho, Yu-Chen 3 participants 5 messages Nov 30, 2020 – Dec 3, 2020

lore
Share & tools
lore
#0 lore raw

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

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
Tested-by on v2 1/1
#1 lore raw
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!

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:

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

#2 lore raw
Quoted 8 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 5 lines
Quoted 5 lines
---
 .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)?

Quoted 26 lines
Quoted 2 lines
 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:

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

#3 lore raw
In reply to Cho, Yu-Chen
Quoted 33 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.

---
 .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 +0 -0
index d0173e82b1..6a256fe07b 100644

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

Quoted 3 lines
.gitlab-ci.yml +0 -0
@@ -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/[email protected]/msg758968.html

Quoted 33 lines
.gitlab-ci.yml +30 -0
+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:
#4 lore raw
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 34 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.

---
 .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- renamed from .gitlab-ci.d/containers.yml +0 -0

ci.d/containers.yml
index 892ca8d838..910754a699 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 +0 -0
index d0173e82b1..6a256fe07b 100644
Quoted 9 lines

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

Quoted 4 lines
.gitlab-ci.yml +0 -0
@@ -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.

Quoted 36 lines

See:
https://www.mail-archive.com/[email protected]/msg758968.html

Quoted 33 lines
.gitlab-ci.yml +30 -0
+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: