New Alpine and Fedora releases were added to libvirt-ci (3.19 and
39, respectively) and old ones were removed. Update the manifest
file and regenerate the rest.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
ci/buildenv/{alpine-317.sh => alpine-319.sh} | 0
ci/buildenv/{fedora-37.sh => fedora-39.sh} | 0
...e-317.Dockerfile => alpine-319.Dockerfile} | 2 +-
...ora-37.Dockerfile => fedora-39.Dockerfile} | 2 +-
ci/gitlab/builds.yml | 64 +++++++++----------
ci/gitlab/containers.yml | 18 +++---
ci/manifest.yml | 18 +++---
7 files changed, 52 insertions(+), 52 deletions(-)
rename ci/buildenv/{alpine-317.sh => alpine-319.sh} (100%)
rename ci/buildenv/{fedora-37.sh => fedora-39.sh} (100%)
rename ci/containers/{alpine-317.Dockerfile => alpine-319.Dockerfile} (98%)
rename ci/containers/{fedora-37.Dockerfile => fedora-39.Dockerfile} (98%)
diff --git a/ci/buildenv/alpine-317.sh b/ci/buildenv/alpine-319.sh
similarity index 100%
rename from ci/buildenv/alpine-317.sh
rename to ci/buildenv/alpine-319.sh
diff --git a/ci/buildenv/fedora-37.sh b/ci/buildenv/fedora-39.sh
similarity index 100%
rename from ci/buildenv/fedora-37.sh
rename to ci/buildenv/fedora-39.sh
diff --git a/ci/containers/alpine-317.Dockerfile b/ci/containers/alpine-319.Dockerfile
similarity index 98%
rename from ci/containers/alpine-317.Dockerfile
rename to ci/containers/alpine-319.Dockerfile
index 461b1a7482..b49f348805 100644
--- a/ci/containers/alpine-317.Dockerfile
+++ b/ci/containers/alpine-319.Dockerfile
@@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/alpine:3.17
+FROM docker.io/library/alpine:3.19
RUN apk update && \
apk upgrade && \
diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-39.Dockerfile
similarity index 98%
rename from ci/containers/fedora-37.Dockerfile
rename to ci/containers/fedora-39.Dockerfile
index 5177f8db1a..700fe64d2f 100644
--- a/ci/containers/fedora-37.Dockerfile
+++ b/ci/containers/fedora-39.Dockerfile
@@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:37
+FROM registry.fedoraproject.org/fedora:39
RUN dnf install -y nosync && \
printf '#!/bin/sh\n\
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 4cb338fac9..5cc904ffb7 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -51,22 +51,22 @@ x86_64-almalinux-8-clang-local-env:
RPM: skip
-x86_64-alpine-317-prebuilt-env:
+x86_64-alpine-319-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
- - job: x86_64-alpine-317-container
+ - job: x86_64-alpine-319-container
optional: true
allow_failure: false
variables:
- NAME: alpine-317
+ NAME: alpine-319
-x86_64-alpine-317-local-env:
+x86_64-alpine-319-local-env:
extends: .native_build_job_local_env
needs: []
allow_failure: false
variables:
- IMAGE: docker.io/library/alpine:3.17
- NAME: alpine-317
+ IMAGE: docker.io/library/alpine:3.19
+ NAME: alpine-319
x86_64-alpine-edge-prebuilt-env:
@@ -233,32 +233,6 @@ x86_64-debian-sid-local-env:
NAME: debian-sid
-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-38-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
@@ -285,6 +259,32 @@ x86_64-fedora-38-local-env:
- libvirt-rpms
+x86_64-fedora-39-prebuilt-env:
+ extends: .native_build_job_prebuilt_env
+ needs:
+ - job: x86_64-fedora-39-container
+ optional: true
+ allow_failure: false
+ variables:
+ NAME: fedora-39
+ artifacts:
+ expire_in: 1 day
+ paths:
+ - libvirt-rpms
+
+x86_64-fedora-39-local-env:
+ extends: .native_build_job_local_env
+ needs: []
+ allow_failure: false
+ variables:
+ IMAGE: registry.fedoraproject.org/fedora:39
+ NAME: fedora-39
+ artifacts:
+ expire_in: 1 day
+ paths:
+ - libvirt-rpms
+
+
x86_64-fedora-rawhide-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 2463d1a5aa..add5e2360f 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -14,11 +14,11 @@ x86_64-almalinux-8-container:
NAME: almalinux-8
-x86_64-alpine-317-container:
+x86_64-alpine-319-container:
extends: .container_job
allow_failure: false
variables:
- NAME: alpine-317
+ NAME: alpine-319
x86_64-alpine-edge-container:
@@ -64,13 +64,6 @@ x86_64-debian-sid-container:
NAME: debian-sid
-x86_64-fedora-37-container:
- extends: .container_job
- allow_failure: false
- variables:
- NAME: fedora-37
-
-
x86_64-fedora-38-container:
extends: .container_job
allow_failure: false
@@ -78,6 +71,13 @@ x86_64-fedora-38-container:
NAME: fedora-38
+x86_64-fedora-39-container:
+ extends: .container_job
+ allow_failure: false
+ variables:
+ NAME: fedora-39
+
+
x86_64-fedora-rawhide-container:
extends: .container_job
allow_failure: true
diff --git a/ci/manifest.yml b/ci/manifest.yml
index afb1fa007d..85f6b9d878 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -19,7 +19,7 @@ targets:
RPM: skip
CC: clang
- alpine-317: x86_64
+ alpine-319: x86_64
alpine-edge:
jobs:
@@ -152,14 +152,6 @@ targets:
containers: false
builds: false
- fedora-37:
- jobs:
- - arch: x86_64
- artifacts:
- expire_in: 1 day
- paths:
- - libvirt-rpms
-
fedora-38:
jobs:
- arch: x86_64
@@ -173,6 +165,14 @@ targets:
- arch: mingw64
+ fedora-39:
+ jobs:
+ - arch: x86_64
+ artifacts:
+ expire_in: 1 day
+ paths:
+ - libvirt-rpms
+
fedora-rawhide:
jobs:
- arch: x86_64
--
2.41.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
