ci: Move from 'centos-8' to 'almalinux-8'

Upstream lcitool suggests that as a solution to 'centos-8' being
removed.

Move also the website and other jobs to depend on
'x86_64-almalinux-8-container'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Peter Krempa 2022-02-14 17:44:12 +01:00
parent eca3daaf5b
commit 9a21d6848c
4 changed files with 16 additions and 16 deletions

View File

@ -56,9 +56,9 @@ include: '/ci/gitlab.yml'
# https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=website # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=website
website: website:
stage: builds stage: builds
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest image: $CI_REGISTRY_IMAGE/ci-almalinux-8:latest
needs: needs:
- x86_64-centos-8-container - x86_64-almalinux-8-container
before_script: before_script:
- *script_variables - *script_variables
script: script:
@ -92,9 +92,9 @@ codestyle:
# https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=potfile # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=potfile
potfile: potfile:
stage: builds stage: builds
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest image: $CI_REGISTRY_IMAGE/ci-almalinux-8:latest
needs: needs:
- x86_64-centos-8-container - x86_64-almalinux-8-container
rules: rules:
- if: "$CI_COMMIT_BRANCH == 'master'" - if: "$CI_COMMIT_BRANCH == 'master'"
before_script: before_script:
@ -114,9 +114,9 @@ potfile:
# Coverity job that is run only by schedules # Coverity job that is run only by schedules
coverity: coverity:
image: $CI_REGISTRY_IMAGE/ci-centos-8:latest image: $CI_REGISTRY_IMAGE/ci-almalinux-8:latest
needs: needs:
- x86_64-centos-8-container - x86_64-almalinux-8-container
stage: builds stage: builds
script: script:
- curl https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o /tmp/cov-analysis-linux64.tgz - curl https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o /tmp/cov-analysis-linux64.tgz

View File

@ -4,7 +4,7 @@
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/centos:8 FROM docker.io/library/almalinux:8
RUN dnf update -y && \ RUN dnf update -y && \
dnf install 'dnf-command(config-manager)' -y && \ dnf install 'dnf-command(config-manager)' -y && \

View File

@ -80,11 +80,11 @@ check-dco:
# Native container jobs # Native container jobs
x86_64-centos-8-container: x86_64-almalinux-8-container:
extends: .container_job extends: .container_job
allow_failure: false allow_failure: false
variables: variables:
NAME: centos-8 NAME: almalinux-8
x86_64-centos-stream-8-container: x86_64-centos-stream-8-container:
@ -379,24 +379,24 @@ mingw64-fedora-rawhide-container:
# Native build jobs # Native build jobs
x86_64-centos-8: x86_64-almalinux-8:
extends: .native_build_job extends: .native_build_job
needs: needs:
- x86_64-centos-8-container - x86_64-almalinux-8-container
allow_failure: false allow_failure: false
variables: variables:
NAME: centos-8 NAME: almalinux-8
RPM: skip RPM: skip
x86_64-centos-8-clang: x86_64-almalinux-8-clang:
extends: .native_build_job extends: .native_build_job
needs: needs:
- x86_64-centos-8-container - x86_64-almalinux-8-container
allow_failure: false allow_failure: false
variables: variables:
CC: clang CC: clang
NAME: centos-8 NAME: almalinux-8
RPM: skip RPM: skip

View File

@ -6,7 +6,7 @@ gitlab:
project: libvirt project: libvirt
targets: targets:
centos-8: almalinux-8:
jobs: jobs:
- arch: x86_64 - arch: x86_64
variables: variables: