Yu-Chen, Cho <a...@suse.com> writes:
> 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. > > Signed-off-by: Yu-Chen, Cho <a...@suse.com> 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) > --- > .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 > > diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml > index 11d079ea58..449a00de70 100644 > --- a/.gitlab-ci.d/containers.yml > +++ b/.gitlab-ci.d/containers.yml > @@ -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 > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 9a8b375188..540a700596 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -195,6 +195,66 @@ acceptance-system-centos: > MAKE_CHECK_ARGS: check-acceptance > <<: *acceptance_definition > <snip> > + > +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 > + > +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. -- Alex Bennée
