Commit 42ba0fa2 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

Drop Ubuntu 19.10

Repos for 19.10 have disappeared, so let's drop it. Usually we'd update to
20.10 instead but that doesn't currently work with an mkosi failure (probably
similar to #18

). Until we can fix this, let's just drop 19.10.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent b18e53bf
Pipeline #243512 passed with stages
in 1 minute and 41 seconds
......@@ -24,7 +24,7 @@ stages:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_DISTRIBUTION_VERSION: '19.10'
FDO_DISTRIBUTION_VERSION: '18.04'
FDO_EXPIRES_AFTER: '1h'
.ci-commons-ubuntu@x86_64:
......@@ -130,30 +130,30 @@ stages:
#
# straight ubuntu build and test
#
ubuntu:19.10@container-build@x86_64:
ubuntu:18.04@container-build@x86_64:
extends: .ubuntu:ci@container-build@x86_64
ubuntu:19.10@check@x86_64:
ubuntu:18.04@check@x86_64:
extends: .ubuntu@check@x86_64
needs:
- ubuntu:19.10@container-build@x86_64
- ubuntu:18.04@container-build@x86_64
# Test FDO_BASE_IMAGE. We don't need to do much here, if our
# FDO_DISTRIBUTION_EXEC script can run curl+wget this means we're running on
# the desired base image. That's good enough.
ubuntu:19.10@base-image@x86_64:
extends: ubuntu:19.10@container-build@x86_64
ubuntu:18.04@base-image@x86_64:
extends: ubuntu:18.04@container-build@x86_64
stage: ubuntu_check
variables:
# We need to duplicate FDO_DISTRIBUTION_TAG here, gitlab doesn't allow nested expansion
FDO_BASE_IMAGE: registry.freedesktop.org/$CI_PROJECT_PATH/ubuntu/19.10:fdo-ci-x86_64-$CI_PIPELINE_ID
FDO_BASE_IMAGE: registry.freedesktop.org/$CI_PROJECT_PATH/ubuntu/18.04:fdo-ci-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: ''
FDO_DISTRIBUTION_EXEC: 'test/test-wget-curl.sh'
FDO_FORCE_REBUILD: 1
FDO_DISTRIBUTION_TAG: fdo-ci-baseimage-x86_64-$CI_PIPELINE_ID
needs:
- ubuntu:19.10@container-build@x86_64
- ubuntu:18.04@container-build@x86_64
#
# /cache ubuntu check (in build stage)
......@@ -209,23 +209,23 @@ ubuntu@cache-check@x86_64:
artifacts: true
ubuntu:19.10@container-build@aarch64:
ubuntu:18.04@container-build@aarch64:
extends: .ubuntu:ci@container-build@aarch64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-aarch64-$CI_PIPELINE_ID
ubuntu:19.10@check@aarch64:
ubuntu:18.04@check@aarch64:
extends: .ubuntu@check@x86_64
tags:
- aarch64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-aarch64-$CI_PIPELINE_ID
needs:
- ubuntu:19.10@container-build@aarch64
- ubuntu:18.04@container-build@aarch64
ubuntu:19.10@qemu-build@x86_64:
ubuntu:18.04@qemu-build@x86_64:
extends: .ubuntu:ci@qemu-build@x86_64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
......@@ -233,33 +233,33 @@ ubuntu:19.10@qemu-build@x86_64:
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-10-30.1
ubuntu:19.10@qemu-check@x86_64:
ubuntu:18.04@qemu-check@x86_64:
extends: .ubuntu@qemu-check@x86_64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
needs:
- ubuntu:19.10@qemu-build@x86_64
- ubuntu:18.04@qemu-build@x86_64
#
# make sure we do not rebuild the image if the tag exists (during the check)
#
do not rebuild ubuntu:19.10@container-build@x86_64:
do not rebuild ubuntu:18.04@container-build@x86_64:
extends: .ubuntu:ci@container-build@x86_64
stage: ubuntu_check
variables:
FDO_UPSTREAM_REPO: $CI_PROJECT_PATH
FDO_DISTRIBUTION_PACKAGES: 'this-package-should-not-exist'
needs:
- ubuntu:19.10@container-build@x86_64
- ubuntu:18.04@container-build@x86_64
#
# check if the labels were correctly applied
#
check labels ubuntu@x86_64:19.10:
check labels ubuntu@x86_64:18.04:
extends:
- ubuntu:19.10@check@x86_64
- ubuntu:18.04@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-10-30.1
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
......@@ -287,7 +287,7 @@ check labels ubuntu@x86_64:19.10:
- '[[ x"$IMAGE_PROJECT" == x"$CI_PROJECT_PATH" ]]'
- '[[ x"$IMAGE_COMMIT" == x"$CI_COMMIT_SHA" ]]'
needs:
- ubuntu:19.10@container-build@x86_64
- ubuntu:18.04@container-build@x86_64
#
......@@ -295,28 +295,12 @@ check labels ubuntu@x86_64:19.10:
# repository (during the check)
# special case where FDO_REPO_SUFFIX == ci_templates_test_upstream
#
pull upstream ubuntu:19.10@container-build@x86_64:
pull upstream ubuntu:18.04@container-build@x86_64:
extends: .ubuntu:ci@container-build@x86_64
stage: ubuntu_check
variables:
FDO_UPSTREAM_REPO: $CI_PROJECT_PATH
FDO_REPO_SUFFIX: ubuntu/ci_templates_test_upstream
FDO_DISTRIBUTION_PACKAGES: 'this-package-should-not-exist'
needs:
- ubuntu:19.10@container-build@x86_64
#
# Try our ubuntu scripts with other versions and check
#
ubuntu:18.04@container-build@x86_64:
extends: .ubuntu:ci@container-build@x86_64
variables:
FDO_DISTRIBUTION_VERSION: '18.04'
ubuntu:18.04@check@x86_64:
extends: .ubuntu@check@x86_64
variables:
FDO_DISTRIBUTION_VERSION: '18.04'
needs:
- ubuntu:18.04@container-build@x86_64
......@@ -2,7 +2,6 @@ ubuntu:
distribution: ubuntu
package_type: debs
versions:
- '19.10'
- '18.04'
aarch64: true
......
......@@ -240,7 +240,7 @@
# extends: .fdo.container-build@ubuntu@x86_64
# variables:
# FDO_DISTRIBUTION_PACKAGES: 'curl wget gcc valgrind'
# FDO_DISTRIBUTION_VERSION: '19.10'
# FDO_DISTRIBUTION_VERSION: '18.04'
# FDO_DISTRIBUTION_TAG: '2020-03-20'
#
#
......@@ -256,7 +256,7 @@
#
# **This variable is required**
#
# The ubuntu version to build, e.g. '19.10', '18.04'
# The ubuntu version to build, e.g. '18.04'
#
# .. attribute:: FDO_DISTRIBUTION_TAG
#
......@@ -559,7 +559,7 @@
# my-ubuntu-test:
# extends: .fdo.distribution-image@ubuntu
# variables:
# FDO_DISTRIBUTION_VERSION: '19.10'
# FDO_DISTRIBUTION_VERSION: '18.04'
# FDO_DISTRIBUTION_TAG: '2020-03-20'
# script:
# - meson builddir
......@@ -571,7 +571,7 @@
#
# **This variable is required**
#
# The ubuntu version to build, e.g. '19.10', '18.04'
# The ubuntu version to build, e.g. '18.04'
#
# The value supplied must be the same as supplied in
# ``.fdo.container-build@ubuntu@x86_64``.
......
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