diff options
| author | Michal Privoznik <mprivozn@redhat.com> | 2024-05-23 10:02:43 +0200 |
|---|---|---|
| committer | Michal Privoznik <mprivozn@redhat.com> | 2024-05-23 10:45:27 +0200 |
| commit | a300a26c0d7f48544c40af268b3245ebd63c7351 (patch) | |
| tree | f6e37a17694ff3d6a57242c990cac528b5fdb6de | |
| parent | 7544f7aec9da0e6ba1f923b523d2484b8dbaef1b (diff) | |
| download | libvirt-ci-a300a26c0d7f48544c40af268b3245ebd63c7351.zip libvirt-ci-a300a26c0d7f48544c40af268b3245ebd63c7351.tar.gz libvirt-ci-a300a26c0d7f48544c40af268b3245ebd63c7351.tar.bz2 | |
Targets: Drop Alpine 3.18 and introduce 3.20
Alpine 3.20 was released yesterday:
https://alpinelinux.org/posts/Alpine-3.20.0-released.html
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| l--------- | ci/gitlab/all_mappings_prep_env/alpine-320-prep.sh (renamed from ci/gitlab/all_mappings_prep_env/alpine-318-prep.sh) | 0 | ||||
| -rw-r--r-- | examples/manifest.yml | 4 | ||||
| -rw-r--r-- | lcitool/facts/mappings.yml | 2 | ||||
| -rw-r--r-- | lcitool/facts/targets/alpine-320.yml (renamed from lcitool/facts/targets/alpine-318.yml) | 4 | ||||
| -rw-r--r-- | tests/data/packages/out/alpine-320.yml (renamed from tests/data/packages/out/alpine-318.yml) | 4 |
6 files changed, 12 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b19450..1ca1f0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -247,19 +247,19 @@ x86_64-check-almalinux-9: IMAGE: docker.io/library/almalinux:9 NAME: almalinux-9 -x86_64-check-alpine-318: +x86_64-check-alpine-319: extends: .check_container_template variables: <<: *apk_dry_run_command - IMAGE: docker.io/library/alpine:3.18 - NAME: alpine-318 + IMAGE: docker.io/library/alpine:3.19 + NAME: alpine-319 -x86_64-check-alpine-319: +x86_64-check-alpine-320: extends: .check_container_template variables: <<: *apk_dry_run_command - IMAGE: docker.io/library/alpine:3.19 - NAME: alpine-319 + IMAGE: docker.io/library/alpine:3.20 + NAME: alpine-320 x86_64-check-alpine-edge: extends: .check_container_template diff --git a/ci/gitlab/all_mappings_prep_env/alpine-318-prep.sh b/ci/gitlab/all_mappings_prep_env/alpine-320-prep.sh index 01c524f..01c524f 120000 --- a/ci/gitlab/all_mappings_prep_env/alpine-318-prep.sh +++ b/ci/gitlab/all_mappings_prep_env/alpine-320-prep.sh diff --git a/examples/manifest.yml b/examples/manifest.yml index b7b0483..cb94364 100644 --- a/examples/manifest.yml +++ b/examples/manifest.yml @@ -96,10 +96,10 @@ targets: almalinux-9: x86_64 - alpine-318: x86_64 - alpine-319: x86_64 + alpine-320: x86_64 + alpine-edge: jobs: - arch: x86_64 diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index c76bc2b..e4a16d7 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -1596,7 +1596,6 @@ mappings: deb: php-dev pkg: php74 rpm: php-devel - Alpine318: php82-dev php-imagick: apk: php83-pecl-imagick @@ -1604,7 +1603,6 @@ mappings: pkg: php74-pecl-imagick Fedora: php-pecl-imagick OpenSUSE: php-imagick - Alpine318: php82-pecl-imagick pixman: default: pixman diff --git a/lcitool/facts/targets/alpine-318.yml b/lcitool/facts/targets/alpine-320.yml index 0dc4364..0108543 100644 --- a/lcitool/facts/targets/alpine-318.yml +++ b/lcitool/facts/targets/alpine-320.yml @@ -1,7 +1,7 @@ --- os: name: 'Alpine' - version: '318' + version: '320' packaging: format: 'apk' @@ -21,4 +21,4 @@ ansible_python_package: python3 ansible_python_interpreter: /usr/bin/python3 containers: - base: docker.io/library/alpine:3.18 + base: docker.io/library/alpine:3.20 diff --git a/tests/data/packages/out/alpine-318.yml b/tests/data/packages/out/alpine-320.yml index 72d448a..1069fff 100644 --- a/tests/data/packages/out/alpine-318.yml +++ b/tests/data/packages/out/alpine-320.yml @@ -177,8 +177,8 @@ native: - perl-xml-writer - perl-xml-xpath - perl-yaml -- php82-dev -- php82-pecl-imagick +- php83-dev +- php83-pecl-imagick - pipewire-dev - pixman-dev - pkgconf |