From: Michal Privoznik <mprivozn(a)redhat.com&gt; - Replace Alpine 3.21 with 3.22 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1860029940 ci/buildenv/{alpine-321.sh => alpine-322.sh} | 0 .../{alpine-321.Dockerfile => alpine-322.Dockerfile} | 2 +- ci/gitlab/builds.yml | 8 ++++---- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename ci/buildenv/{alpine-321.sh => alpine-322.sh} (100%) rename ci/containers/{alpine-321.Dockerfile => alpine-322.Dockerfile} (98%) diff --git a/ci/buildenv/alpine-321.sh b/ci/buildenv/alpine-322.sh similarity index 100% rename from ci/buildenv/alpine-321.sh rename to ci/buildenv/alpine-322.sh diff --git a/ci/containers/alpine-321.Dockerfile b/ci/containers/alpine-322.Dockerfile similarity index 98% rename from ci/containers/alpine-321.Dockerfile rename to ci/containers/alpine-322.Dockerfile index 2351b03653..03db9a3d22 100644 --- a/ci/containers/alpine-321.Dockerfile +++ b/ci/containers/alpine-322.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.21 +FROM docker.io/library/alpine:3.22 RUN apk update && \ apk upgrade && \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 5fab2008d8..ae691862c2 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -33,15 +33,15 @@ x86_64-almalinux-9-clang: TARGET_BASE_IMAGE: docker.io/library/almalinux:9 -x86_64-alpine-321: +x86_64-alpine-322: extends: .native_build_job needs: - - job: x86_64-alpine-321-container + - job: x86_64-alpine-322-container optional: true allow_failure: false variables: - NAME: alpine-321 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.21 + NAME: alpine-322 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.22 x86_64-alpine-edge: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 05809fbdeb..0650e4781c 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-9-container: NAME: almalinux-9 -x86_64-alpine-321-container: +x86_64-alpine-322-container: extends: .container_job allow_failure: false variables: - NAME: alpine-321 + NAME: alpine-322 x86_64-alpine-edge-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 14bfef25d2..21d570cb00 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-321: x86_64 + alpine-322: x86_64 alpine-edge: jobs: -- 2.49.0