diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-04-23 09:28:36 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-04-23 01:41:12 +0000 |
| commit | 72f747f255d9f599853277c5ebb777652ffbc477 (patch) | |
| tree | 1df41dd1acabd55856744e8c94d6af65ac1348a6 | |
| parent | a37d6dcc9c2ec7ebd0d3609e01da1cfcec28db6e (diff) | |
gitlab CI: switch to Ubuntu 21.04
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 28 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53ed427b..209dc004 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index c3569cbb..4046a023 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -63,8 +63,8 @@ distributions: - name: ubuntu tag: *default_tag versions: - - '20.04' - '20.10' + - '21.04' packages: - git - gcc |