From 72f747f255d9f599853277c5ebb777652ffbc477 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 23 Apr 2021 09:28:36 +1000
Subject: [PATCH] gitlab CI: switch to Ubuntu 21.04

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml        | 28 ++++++++++++++--------------
 .gitlab-ci/config.yml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53ed427..209dc00 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 c3569cb..4046a02 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
-- 
2.7.4