gitlab-ci: enable F38 container and regenerate containers

This commit is contained in:
Thomas Haller 2022-10-07 20:46:25 +02:00
parent d5d6823558
commit dc2cbe1858
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 38 additions and 6 deletions

View file

@ -48,11 +48,11 @@ variables:
#
# This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag".
FEDORA_TAG: '2022-07-06.0-fa9b72c30822'
UBUNTU_TAG: '2022-07-06.0-4b75c457c847'
DEBIAN_TAG: '2022-07-06.0-4b75c457c847'
CENTOS_TAG: '2022-07-06.0-fa9b72c30822'
ALPINE_TAG: '2022-07-06.0-a2327031454c'
FEDORA_TAG: '2022-10-07.0-2f8d7f7c18cb'
UBUNTU_TAG: '2022-10-07.0-25f2a8708cc8'
DEBIAN_TAG: '2022-10-07.0-25f2a8708cc8'
CENTOS_TAG: '2022-10-07.0-2f8d7f7c18cb'
ALPINE_TAG: '2022-10-07.0-3e4fecdd883f'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@ -168,6 +168,16 @@ fedora:37@container-prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
fedora:38@container-prep:
extends:
- .fdo.container-build@fedora
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
ubuntu:18.04@container-prep:
extends:
- .fdo.container-build@ubuntu
@ -464,6 +474,15 @@ fedora:37@container-clean:
FDO_DISTRIBUTION_VERSION: '37'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:38@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
ubuntu:18.04@container-clean:
extends:
- .container-clean
@ -755,6 +774,18 @@ t_fedora:37:
- "fedora:37@container-prep"
when: manual
t_fedora:38:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .nm_artifacts_debug
variables:
FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:38@container-prep"
when: manual
t_ubuntu:18.04:
extends:
- .build@template

View file

@ -8,7 +8,7 @@
#
# We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2022-07-06.0'
.default_tag: &default_tag '2022-10-07.0'
# The list of all distributions we want to create job for.
@ -26,6 +26,7 @@ distributions:
- '35'
- '36'
- '37'
- '38'
- name: ubuntu
tag: *default_tag
base_type: debian