gitlab CI: update Ubuntu to current distros

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c001707..c393020 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,13 +88,13 @@ variables:
   # changing these will force rebuilding the associated image
   # Note: these tags have no meaning and are not tied to a particular
   # libinput version
-  FEDORA_TAG:  '2020-07-22.0'
-  DEBIAN_TAG:  '2020-07-22.0'
-  UBUNTU_TAG:  '2020-07-22.0'
-  ARCH_TAG:    '2020-07-22.0'
-  ALPINE_TAG:  '2020-07-22.0'
-  FREEBSD_TAG: '2020-07-22.0'
-  QEMU_TAG:    'qemu-vm-2020-07-22.0'
+  FEDORA_TAG:  '2020-11-09.0'
+  DEBIAN_TAG:  '2020-11-09.0'
+  UBUNTU_TAG:  '2020-11-09.0'
+  ARCH_TAG:    '2020-11-09.0'
+  ALPINE_TAG:  '2020-11-09.0'
+  FREEBSD_TAG: '2020-11-09.0'
+  QEMU_TAG:    'qemu-vm-2020-11-09.0'
 
   UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"
 
@@ -241,14 +241,25 @@ debian:stable@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:19.10@container-prep:
+ubuntu:20.04@container-prep:
   extends:
     - .fdo.container-build@ubuntu
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '19.10'
+    FDO_DISTRIBUTION_VERSION: '20.04'
+    FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
+
+ubuntu:20.10@container-prep:
+  extends:
+    - .fdo.container-build@ubuntu
+    - .policy
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '20.10'
     FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
@@ -385,13 +396,22 @@ debian:stable@container-clean:
     FDO_DISTRIBUTION_VERSION: 'stable'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:19.10@container-clean:
+ubuntu:20.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: '19.10'
+    FDO_DISTRIBUTION_VERSION: '20.04'
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
+
+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.10'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
 arch:rolling@container-clean:
@@ -845,16 +865,28 @@ debian:stable@default-build:
     - "debian:stable@container-prep"
 
 
-ubuntu:19.10@default-build:
+ubuntu:20.04@default-build:
+  stage: distro
+  extends:
+    - .build@template
+    - .fdo.distribution-image@ubuntu
+  variables:
+    FDO_DISTRIBUTION_VERSION: '20.04'
+    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
+  needs:
+    - "ubuntu:20.04@container-prep"
+
+
+ubuntu:20.10@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_VERSION: '19.10'
+    FDO_DISTRIBUTION_VERSION: '20.10'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
   needs:
-    - "ubuntu:19.10@container-prep"
+    - "ubuntu:20.10@container-prep"
 
 
 arch:rolling@default-build:

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 26bc0bd..4df4e55 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,7 +3,7 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2020-07-22.0'
+.default_tag: &default_tag '2020-11-09.0'
 
 distributions:
   - name: fedora
@@ -20,7 +20,8 @@ distributions:
   - name: ubuntu
     tag: *default_tag
     versions:
-      - '19.10'
+      - '20.04'
+      - '20.10'
   - name: arch
     tag: *default_tag
     versions: