ci: Switch from Fedora 38 to Fedora 40

Since Fedora 40 was released recently, Fedora 38 is now
unsupported. Drop Fedora 38 and introduce Fedora 40 to our CI.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2024-05-03 19:48:28 +02:00
parent 24a3d3975f
commit dd085b1a16
10 changed files with 46 additions and 70 deletions

View File

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

View File

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

View File

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

View File

@ -127,21 +127,6 @@ x86_64-debian-sid:
TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
x86_64-fedora-38:
extends: .native_build_job
needs:
- job: x86_64-fedora-38-container
optional: true
allow_failure: false
variables:
NAME: fedora-38
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
x86_64-fedora-39: x86_64-fedora-39:
extends: .native_build_job extends: .native_build_job
needs: needs:
@ -157,6 +142,21 @@ x86_64-fedora-39:
- libvirt-rpms - libvirt-rpms
x86_64-fedora-40:
extends: .native_build_job
needs:
- job: x86_64-fedora-40-container
optional: true
allow_failure: false
variables:
NAME: fedora-40
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
x86_64-fedora-rawhide: x86_64-fedora-rawhide:
extends: .native_build_job extends: .native_build_job
needs: needs:
@ -547,29 +547,29 @@ s390x-debian-sid:
TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
mingw32-fedora-38: mingw32-fedora-40:
extends: .cross_build_job extends: .cross_build_job
needs: needs:
- job: mingw32-fedora-38-container - job: mingw32-fedora-40-container
optional: true optional: true
allow_failure: false allow_failure: false
variables: variables:
CROSS: mingw32 CROSS: mingw32
JOB_OPTIONAL: 1 JOB_OPTIONAL: 1
NAME: fedora-38 NAME: fedora-40
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38 TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
mingw64-fedora-38: mingw64-fedora-40:
extends: .cross_build_job extends: .cross_build_job
needs: needs:
- job: mingw64-fedora-38-container - job: mingw64-fedora-40-container
optional: true optional: true
allow_failure: false allow_failure: false
variables: variables:
CROSS: mingw64 CROSS: mingw64
NAME: fedora-38 NAME: fedora-40
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38 TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
mingw32-fedora-rawhide: mingw32-fedora-rawhide:

View File

@ -57,13 +57,6 @@ x86_64-debian-sid-container:
NAME: debian-sid NAME: debian-sid
x86_64-fedora-38-container:
extends: .container_job
allow_failure: false
variables:
NAME: fedora-38
x86_64-fedora-39-container: x86_64-fedora-39-container:
extends: .container_job extends: .container_job
allow_failure: false allow_failure: false
@ -71,6 +64,13 @@ x86_64-fedora-39-container:
NAME: fedora-39 NAME: fedora-39
x86_64-fedora-40-container:
extends: .container_job
allow_failure: false
variables:
NAME: fedora-40
x86_64-fedora-rawhide-container: x86_64-fedora-rawhide-container:
extends: .container_job extends: .container_job
allow_failure: true allow_failure: true
@ -292,19 +292,19 @@ s390x-debian-sid-container:
NAME: debian-sid-cross-s390x NAME: debian-sid-cross-s390x
mingw32-fedora-38-container: mingw32-fedora-40-container:
extends: .container_job extends: .container_job
allow_failure: false allow_failure: false
variables: variables:
JOB_OPTIONAL: 1 JOB_OPTIONAL: 1
NAME: fedora-38-cross-mingw32 NAME: fedora-40-cross-mingw32
mingw64-fedora-38-container: mingw64-fedora-40-container:
extends: .container_job extends: .container_job
allow_failure: false allow_failure: false
variables: variables:
NAME: fedora-38-cross-mingw64 NAME: fedora-40-cross-mingw64
mingw32-fedora-rawhide-container: mingw32-fedora-rawhide-container:

View File

@ -25,30 +25,6 @@ centos-stream-9-tests:
ref: master ref: master
artifacts: true artifacts: true
# NOTE The integration tests use artifacts produced by the libvirt-perl
# and libvirt-python CI jobs, so the new target needs to be introduced
# there before it can be used here. The VM template for the target
# also needs to be created on the runner host.
fedora-38-tests:
extends: .integration_tests
variables:
# needed by libvirt-gitlab-executor
DISTRO: fedora-38
# 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
needs:
- x86_64-fedora-38
- project: libvirt/libvirt-perl
job: x86_64-fedora-38
ref: master
artifacts: true
- project: libvirt/libvirt-python
job: x86_64-fedora-38
ref: master
artifacts: true
# NOTE The integration tests use artifacts produced by the libvirt-perl # NOTE The integration tests use artifacts produced by the libvirt-perl
# and libvirt-python CI jobs, so the new target needs to be introduced # and libvirt-python CI jobs, so the new target needs to be introduced
# there before it can be used here. The VM template for the target # there before it can be used here. The VM template for the target

View File

@ -144,7 +144,15 @@ targets:
containers: false containers: false
builds: false builds: false
fedora-38: fedora-39:
jobs:
- arch: x86_64
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
fedora-40:
jobs: jobs:
- arch: x86_64 - arch: x86_64
artifacts: artifacts:
@ -157,14 +165,6 @@ targets:
- arch: mingw64 - arch: mingw64
fedora-39:
jobs:
- arch: x86_64
artifacts:
expire_in: 1 day
paths:
- libvirt-rpms
fedora-rawhide: fedora-rawhide:
jobs: jobs:
- arch: x86_64 - arch: x86_64