[PATCH 2/3] 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(a)redhat.com&gt; --- .gitlab-ci.yml | 6 +++--- ...entos-8.Dockerfile => almalinux-8.Dockerfile} | 2 +- ci/gitlab.yml | 16 ++++++++-------- ci/manifest.yml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) rename ci/containers/{centos-8.Dockerfile => almalinux-8.Dockerfile} (98%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ba11a0431..ec1b284da7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ website: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container before_script: - *script_variables script: @@ -94,7 +94,7 @@ potfile: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container rules: - if: "$CI_COMMIT_BRANCH == 'master'" before_script: @@ -116,7 +116,7 @@ potfile: coverity: image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container stage: builds 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 diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile similarity index 98% rename from ci/containers/centos-8.Dockerfile rename to ci/containers/almalinux-8.Dockerfile index f01ca6a0d9..55ce0908a3 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/almalinux-8.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/centos:8 +FROM docker.io/library/almalinux:8 RUN dnf update -y && \ dnf install 'dnf-command(config-manager)' -y && \ diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 48e6363c7c..cc03a2fe49 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -80,11 +80,11 @@ check-dco: # Native container jobs -x86_64-centos-8-container: +x86_64-almalinux-8-container: extends: .container_job allow_failure: false variables: - NAME: centos-8 + NAME: almalinux-8 x86_64-centos-stream-8-container: @@ -379,24 +379,24 @@ mingw64-fedora-rawhide-container: # Native build jobs -x86_64-centos-8: +x86_64-almalinux-8: extends: .native_build_job needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container allow_failure: false variables: - NAME: centos-8 + NAME: almalinux-8 RPM: skip -x86_64-centos-8-clang: +x86_64-almalinux-8-clang: extends: .native_build_job needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container allow_failure: false variables: CC: clang - NAME: centos-8 + NAME: almalinux-8 RPM: skip diff --git a/ci/manifest.yml b/ci/manifest.yml index 1cc589955c..87d923ae78 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -6,7 +6,7 @@ gitlab: project: libvirt targets: - centos-8: + almalinux-8: jobs: - arch: x86_64 variables: -- 2.34.1