Commit 72f747f2 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

gitlab CI: switch to Ubuntu 21.04


Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent a37d6dcc
Pipeline #310389 passed with stages
in 23 minutes and 52 seconds
......@@ -225,25 +225,25 @@ debian:stable@container-prep:
FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
ubuntu:20.04@container-prep:
ubuntu:20.10@container-prep:
extends:
- .fdo.container-build@ubuntu
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_VERSION: '20.10'
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
ubuntu:20.10@container-prep:
ubuntu:21.04@container-prep:
extends:
- .fdo.container-build@ubuntu
- .policy
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '20.10'
FDO_DISTRIBUTION_VERSION: '21.04'
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
......@@ -380,22 +380,22 @@ debian:stable@container-clean:
FDO_DISTRIBUTION_VERSION: 'stable'
FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
ubuntu:20.04@container-clean:
ubuntu:20.10@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_VERSION: '20.10'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
ubuntu:20.10@container-clean:
ubuntu:21.04@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '20.10'
FDO_DISTRIBUTION_VERSION: '21.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
arch:rolling@container-clean:
......@@ -953,28 +953,28 @@ debian:stable@default-build:
- "debian:stable@container-prep"
ubuntu:20.04@default-build:
ubuntu:20.10@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@ubuntu
variables:
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_VERSION: '20.10'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs:
- "ubuntu:20.04@container-prep"
- "ubuntu:20.10@container-prep"
ubuntu:20.10@default-build:
ubuntu:21.04@default-build:
stage: distro
extends:
- .build@template
- .fdo.distribution-image@ubuntu
variables:
FDO_DISTRIBUTION_VERSION: '20.10'
FDO_DISTRIBUTION_VERSION: '21.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs:
- "ubuntu:20.10@container-prep"
- "ubuntu:21.04@container-prep"
arch:rolling@default-build:
......
......@@ -63,8 +63,8 @@ distributions:
- name: ubuntu
tag: *default_tag
versions:
- '20.04'
- '20.10'
- '21.04'
packages:
- git
- gcc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment