Commit 58cf8541 authored by Peter Hutterer's avatar Peter Hutterer

gitlab CI: Ubuntu 19.04 is EOL, drop it

Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent d107d58c
...@@ -244,18 +244,6 @@ ubuntu:19.10@container-prep: ...@@ -244,18 +244,6 @@ ubuntu:19.10@container-prep:
FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG 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: arch:rolling@container-prep:
extends: extends:
- .fdo.container-build@arch - .fdo.container-build@arch
...@@ -408,16 +396,6 @@ ubuntu:19.10@container-clean: ...@@ -408,16 +396,6 @@ ubuntu:19.10@container-clean:
FDO_DISTRIBUTION_VERSION: '19.10' FDO_DISTRIBUTION_VERSION: '19.10'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG 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: arch:rolling@container-clean:
extends: extends:
- .container-clean - .container-clean
...@@ -835,18 +813,6 @@ ubuntu:19.10@default-build: ...@@ -835,18 +813,6 @@ ubuntu:19.10@default-build:
- "ubuntu:19.10@container-prep" - "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: arch:rolling@default-build:
stage: distro stage: distro
extends: extends:
......
...@@ -18,7 +18,6 @@ distributions: ...@@ -18,7 +18,6 @@ distributions:
tag: *default_tag tag: *default_tag
versions: versions:
- '19.10' - '19.10'
- '19.04'
- name: arch - name: arch
tag: *default_tag tag: *default_tag
versions: versions:
......
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