ci: refresh with latest lcitool manifest

Main lcitool changes:
- added Alpine 3.17 and 3.18 targets
- dropped Alpine 3.15 and 3.16

Note that we're not actively testing all Alpine targets due to CI
quota, so only 3.17 is used as a replacement for 3.15 in this patch.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Erik Skultety 2023-05-31 11:32:09 +02:00
parent f26923fb2e
commit adf67ca987
6 changed files with 13 additions and 11 deletions

View File

@ -60,6 +60,7 @@ function install_buildenv() {
python3 \ python3 \
qemu-img \ qemu-img \
readline-dev \ readline-dev \
rpcgen \
samurai \ samurai \
sed \ sed \
util-linux-dev \ util-linux-dev \

View File

@ -4,7 +4,7 @@
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/alpine:3.15 FROM docker.io/library/alpine:3.17
RUN apk update && \ RUN apk update && \
apk upgrade && \ apk upgrade && \
@ -61,6 +61,7 @@ RUN apk update && \
python3 \ python3 \
qemu-img \ qemu-img \
readline-dev \ readline-dev \
rpcgen \
samurai \ samurai \
sed \ sed \
util-linux-dev \ util-linux-dev \

View File

@ -51,22 +51,22 @@ x86_64-almalinux-8-clang-local-env:
RPM: skip RPM: skip
x86_64-alpine-315-prebuilt-env: x86_64-alpine-317-prebuilt-env:
extends: .native_build_job_prebuilt_env extends: .native_build_job_prebuilt_env
needs: needs:
- job: x86_64-alpine-315-container - job: x86_64-alpine-317-container
optional: true optional: true
allow_failure: false allow_failure: false
variables: variables:
NAME: alpine-315 NAME: alpine-317
x86_64-alpine-315-local-env: x86_64-alpine-317-local-env:
extends: .native_build_job_local_env extends: .native_build_job_local_env
needs: [] needs: []
allow_failure: false allow_failure: false
variables: variables:
IMAGE: docker.io/library/alpine:3.15 IMAGE: docker.io/library/alpine:3.17
NAME: alpine-315 NAME: alpine-317
x86_64-alpine-edge-prebuilt-env: x86_64-alpine-edge-prebuilt-env:

View File

@ -14,7 +14,7 @@
# Note: never publish from merge requests since they have non-committed code # Note: never publish from merge requests since they have non-committed code
# #
.container_job: .container_job:
image: docker:stable image: docker:latest
stage: containers stage: containers
interruptible: false interruptible: false
needs: [] needs: []

View File

@ -14,11 +14,11 @@ x86_64-almalinux-8-container:
NAME: almalinux-8 NAME: almalinux-8
x86_64-alpine-315-container: x86_64-alpine-317-container:
extends: .container_job extends: .container_job
allow_failure: false allow_failure: false
variables: variables:
NAME: alpine-315 NAME: alpine-317
x86_64-alpine-edge-container: x86_64-alpine-edge-container:

View File

@ -19,7 +19,7 @@ targets:
RPM: skip RPM: skip
CC: clang CC: clang
alpine-315: x86_64 alpine-317: x86_64
alpine-edge: alpine-edge:
jobs: jobs: