External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Refresh and add Fedora 37 target

Browse Source 
Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Erik Skultety 2023-01-04 10:12:42 +01:00
parent d9193ff92b
commit 3ebfeaa206
11 changed files with 111 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ci/buildenv/fedora-36-cross-mingw32.sh → ci/buildenv/fedora-37-cross-mingw32.sh
View File

0
ci/buildenv/fedora-36-cross-mingw64.sh → ci/buildenv/fedora-37-cross-mingw64.sh
View File

1
ci/buildenv/fedora-35.sh → ci/buildenv/fedora-37.sh
View File

@ -58,7 +58,6 @@ function install_buildenv() {
lvm2 \
make \
meson \
netcf-devel \
nfs-utils \
ninja-build \
numactl-devel \

10
ci/cirrus/macos-12.vars
View File

@ -4,13 +4,13 @@
#
# https://gitlab.com/libvirt/libvirt-ci
CCACHE='/usr/local/bin/ccache'
CCACHE='/opt/homebrew/bin/ccache'
CPAN_PKGS=''
CROSS_PKGS=''
MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/usr/local/bin/pip3'
PIP3='/opt/homebrew/bin/pip3'
PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
PYTHON='/opt/homebrew/bin/python3'

2
ci/containers/fedora-36-cross-mingw32.Dockerfile → ci/containers/fedora-37-cross-mingw32.Dockerfile
View File

@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:36
FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\

2
ci/containers/fedora-36-cross-mingw64.Dockerfile → ci/containers/fedora-37-cross-mingw64.Dockerfile
View File

@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:36
FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\

3
ci/containers/fedora-35.Dockerfile → ci/containers/fedora-37.Dockerfile
View File

@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:35
FROM registry.fedoraproject.org/fedora:37
RUN dnf install -y nosync && \
echo -e '#!/bin/sh\n\
@ -69,7 +69,6 @@ exec "$@"' > /usr/bin/nosync && \
lvm2 \
make \
meson \
netcf-devel \
nfs-utils \
ninja-build \
numactl-devel \

76
ci/gitlab/builds.yml
View File

@ -193,32 +193,6 @@ x86_64-debian-sid-local-env:
NAME: debian-sid
x86_64-fedora-35-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
- job: x86_64-fedora-35-container
optional: true
allow_failure: false
variables:
NAME: fedora-35
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
x86_64-fedora-35-local-env:
extends: .native_build_job_local_env
needs: []
allow_failure: false
variables:
IMAGE: registry.fedoraproject.org/fedora:35
NAME: fedora-35
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
x86_64-fedora-36-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
@ -245,6 +219,32 @@ x86_64-fedora-36-local-env:
- libvirt-rpms
x86_64-fedora-37-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
- job: x86_64-fedora-37-container
optional: true
allow_failure: false
variables:
NAME: fedora-37
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
x86_64-fedora-37-local-env:
extends: .native_build_job_local_env
needs: []
allow_failure: false
variables:
IMAGE: registry.fedoraproject.org/fedora:37
NAME: fedora-37
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
x86_64-fedora-rawhide-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
@ -746,46 +746,46 @@ s390x-debian-sid-local-env:
NAME: debian-sid
mingw32-fedora-36-prebuilt-env:
mingw32-fedora-37-prebuilt-env:
extends: .cross_build_job_prebuilt_env
needs:
- job: mingw32-fedora-36-container
- job: mingw32-fedora-37-container
optional: true
allow_failure: false
variables:
CROSS: mingw32
JOB_OPTIONAL: 1
NAME: fedora-36
NAME: fedora-37
mingw32-fedora-36-local-env:
mingw32-fedora-37-local-env:
extends: .cross_build_job_local_env
needs: []
allow_failure: false
variables:
CROSS: mingw32
IMAGE: registry.fedoraproject.org/fedora:36
IMAGE: registry.fedoraproject.org/fedora:37
JOB_OPTIONAL: 1
NAME: fedora-36
NAME: fedora-37
mingw64-fedora-36-prebuilt-env:
mingw64-fedora-37-prebuilt-env:
extends: .cross_build_job_prebuilt_env
needs:
- job: mingw64-fedora-36-container
- job: mingw64-fedora-37-container
optional: true
allow_failure: false
variables:
CROSS: mingw64
NAME: fedora-36
NAME: fedora-37
mingw64-fedora-36-local-env:
mingw64-fedora-37-local-env:
extends: .cross_build_job_local_env
needs: []
allow_failure: false
variables:
CROSS: mingw64
IMAGE: registry.fedoraproject.org/fedora:36
NAME: fedora-36
IMAGE: registry.fedoraproject.org/fedora:37
NAME: fedora-37
mingw32-fedora-rawhide-prebuilt-env:

22
ci/gitlab/containers.yml
View File

@ -56,13 +56,6 @@ x86_64-debian-sid-container:
NAME: debian-sid
x86_64-fedora-35-container:
extends: .container_job
allow_failure: false
variables:
NAME: fedora-35
x86_64-fedora-36-container:
extends: .container_job
allow_failure: false
@ -70,6 +63,13 @@ x86_64-fedora-36-container:
NAME: fedora-36
x86_64-fedora-37-container:
extends: .container_job
allow_failure: false
variables:
NAME: fedora-37
x86_64-fedora-rawhide-container:
extends: .container_job
allow_failure: true
@ -235,19 +235,19 @@ s390x-debian-sid-container:
NAME: debian-sid-cross-s390x
mingw32-fedora-36-container:
mingw32-fedora-37-container:
extends: .container_job
allow_failure: false
variables:
JOB_OPTIONAL: 1
NAME: fedora-36-cross-mingw32
NAME: fedora-37-cross-mingw32
mingw64-fedora-36-container:
mingw64-fedora-37-container:
extends: .container_job
allow_failure: false
variables:
NAME: fedora-36-cross-mingw64
NAME: fedora-37-cross-mingw64
mingw32-fedora-rawhide-container:

104
ci/integration.yml
View File

@ -81,46 +81,6 @@ centos-stream-9-tests-local-env:
artifacts: true
.fedora-35-tests:
variables:
# needed by libvirt-gitlab-executor
DISTRO: fedora-35
# can be overridden in forks to set a different runner tag
LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
tags:
- $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
fedora-35-tests-prebuilt-env:
extends:
- .integration_tests_prebuilt_env
- .fedora-35-tests
needs:
- x86_64-fedora-35-prebuilt-env
- project: libvirt/libvirt-perl
job: x86_64-fedora-35-prebuilt-env
ref: master
artifacts: true
- project: libvirt/libvirt-python
job: x86_64-fedora-35-prebuilt-env
ref: master
artifacts: true
fedora-35-tests-local-env:
extends:
- .integration_tests_local_env
- .fedora-35-tests
needs:
- x86_64-fedora-35-local-env
- project: libvirt/libvirt-perl
job: x86_64-fedora-35-prebuilt-env
ref: master
artifacts: true
- project: libvirt/libvirt-python
job: x86_64-fedora-35-prebuilt-env
ref: master
artifacts: true
.fedora-36-tests:
variables:
# needed by libvirt-gitlab-executor
@ -161,41 +121,81 @@ fedora-36-tests-local-env:
artifacts: true
.fedora-36-upstream-qemu-tests:
.fedora-37-tests:
variables:
# needed by libvirt-gitlab-executor
DISTRO: fedora-36
DISTRO: fedora-37
# can be overridden in forks to set a different runner tag
LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
tags:
- $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
fedora-36-upstream-qemu-tests-prebuilt-env:
fedora-37-tests-prebuilt-env:
extends:
- .integration_tests_prebuilt_env
- .fedora-36-upstream-qemu-tests
- .fedora-37-tests
needs:
- x86_64-fedora-36-prebuilt-env
- x86_64-fedora-37-prebuilt-env
- project: libvirt/libvirt-perl
job: x86_64-fedora-36-prebuilt-env
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true
- project: libvirt/libvirt-python
job: x86_64-fedora-36-prebuilt-env
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true
fedora-36-upstream-qemu-tests-local-env:
fedora-37-tests-local-env:
extends:
- .integration_tests_local_env
- .fedora-36-upstream-qemu-tests
- .fedora-37-tests
needs:
- x86_64-fedora-36-local-env
- x86_64-fedora-37-local-env
- project: libvirt/libvirt-perl
job: x86_64-fedora-36-prebuilt-env
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true
- project: libvirt/libvirt-python
job: x86_64-fedora-36-prebuilt-env
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true
.fedora-37-upstream-qemu-tests:
variables:
# needed by libvirt-gitlab-executor
DISTRO: fedora-37
# can be overridden in forks to set a different runner tag
LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
tags:
- $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
fedora-37-upstream-qemu-tests-prebuilt-env:
extends:
- .integration_tests_prebuilt_env
- .fedora-37-upstream-qemu-tests
needs:
- x86_64-fedora-37-prebuilt-env
- project: libvirt/libvirt-perl
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true
- project: libvirt/libvirt-python
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true
fedora-37-upstream-qemu-tests-local-env:
extends:
- .integration_tests_local_env
- .fedora-37-upstream-qemu-tests
needs:
- x86_64-fedora-37-local-env
- project: libvirt/libvirt-perl
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true
- project: libvirt/libvirt-python
job: x86_64-fedora-37-prebuilt-env
ref: master
artifacts: true

4
ci/manifest.yml
View File

@ -116,7 +116,7 @@ targets:
containers: false
builds: false
fedora-35:
fedora-36:
jobs:
- arch: x86_64
artifacts:
@ -124,7 +124,7 @@ targets:
paths:
- libvirt-rpms
fedora-36:
fedora-37:
jobs:
- arch: x86_64
artifacts: