gitlab CI: Ubuntu 19.04 is EOL, drop it

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 278af6b..86fc859 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,18 +244,6 @@ ubuntu:19.10@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
-ubuntu:19.04@container-prep:
-  extends:
-    - .fdo.container-build@ubuntu
-    - .policy
-    - .rebuild_for_schedule
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '19.04'
-    FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
-    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
 arch:rolling@container-prep:
   extends:
     - .fdo.container-build@arch
@@ -408,16 +396,6 @@ ubuntu:19.10@container-clean:
     FDO_DISTRIBUTION_VERSION: '19.10'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
-ubuntu:19.04@container-clean:
-  extends:
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    UBUNTU_VERSION: '19.04'
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '19.04'
-    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-
 arch:rolling@container-clean:
   extends:
     - .container-clean
@@ -835,18 +813,6 @@ ubuntu:19.10@default-build:
     - "ubuntu:19.10@container-prep"
 
 
-ubuntu:19.04@default-build:
-  stage: distro
-  extends:
-    - .build@template
-    - .fdo.distribution-image@ubuntu
-  variables:
-    FDO_DISTRIBUTION_VERSION: '19.04'
-    FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
-  needs:
-    - "ubuntu:19.04@container-prep"
-
-
 arch:rolling@default-build:
   stage: distro
   extends:

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 00fc5b6..020354d 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -18,7 +18,6 @@ distributions:
     tag: *default_tag
     versions:
       - '19.10'
-      - '19.04'
   - name: arch
     tag: *default_tag
     versions: