Commit db8eb22c authored by Peter Hutterer's avatar Peter Hutterer Committed by Benjamin Tissoires
Browse files

Re-order the Debian releases to run qemu tests on Buster



Our CI template is set up so that we use the first version listed for the
qemu build. Stretch is unreliable for qemu, it drops to emergency shell 2
out of 3 times which slows down development.

Let's re-order so we do the qemu test on buster instead, it's the latest
stable release anyway.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 627b99df
Pipeline #272681 passed with stages
in 3 minutes and 12 seconds
......@@ -24,7 +24,7 @@ stages:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_DISTRIBUTION_VERSION: 'stretch'
FDO_DISTRIBUTION_VERSION: 'buster'
FDO_EXPIRES_AFTER: '1h'
.ci-commons-debian@x86_64:
......@@ -130,30 +130,30 @@ stages:
#
# straight debian build and test
#
debian:stretch@container-build@x86_64:
debian:buster@container-build@x86_64:
extends: .debian:ci@container-build@x86_64
debian:stretch@check@x86_64:
debian:buster@check@x86_64:
extends: .debian@check@x86_64
needs:
- debian:stretch@container-build@x86_64
- debian:buster@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.
debian:stretch@base-image@x86_64:
extends: debian:stretch@container-build@x86_64
debian:buster@base-image@x86_64:
extends: debian:buster@container-build@x86_64
stage: debian_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/debian/stretch:fdo-ci-x86_64-$CI_PIPELINE_ID
FDO_BASE_IMAGE: registry.freedesktop.org/$CI_PROJECT_PATH/debian/buster: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:
- debian:stretch@container-build@x86_64
- debian:buster@container-build@x86_64
#
# /cache debian check (in build stage)
......@@ -209,23 +209,23 @@ debian@cache-check@x86_64:
artifacts: true
debian:stretch@container-build@aarch64:
debian:buster@container-build@aarch64:
extends: .debian:ci@container-build@aarch64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-aarch64-$CI_PIPELINE_ID
debian:stretch@check@aarch64:
debian:buster@check@aarch64:
extends: .debian@check@x86_64
tags:
- aarch64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-aarch64-$CI_PIPELINE_ID
needs:
- debian:stretch@container-build@aarch64
- debian:buster@container-build@aarch64
debian:stretch@qemu-build@x86_64:
debian:buster@qemu-build@x86_64:
extends: .debian:ci@qemu-build@x86_64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
......@@ -233,33 +233,33 @@ debian:stretch@qemu-build@x86_64:
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2021-02-15.0
debian:stretch@qemu-check@x86_64:
debian:buster@qemu-check@x86_64:
extends: .debian@qemu-check@x86_64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
needs:
- debian:stretch@qemu-build@x86_64
- debian:buster@qemu-build@x86_64
#
# make sure we do not rebuild the image if the tag exists (during the check)
#
do not rebuild debian:stretch@container-build@x86_64:
do not rebuild debian:buster@container-build@x86_64:
extends: .debian:ci@container-build@x86_64
stage: debian_check
variables:
FDO_UPSTREAM_REPO: $CI_PROJECT_PATH
FDO_DISTRIBUTION_PACKAGES: 'this-package-should-not-exist'
needs:
- debian:stretch@container-build@x86_64
- debian:buster@container-build@x86_64
#
# check if the labels were correctly applied
#
check labels debian@x86_64:stretch:
check labels debian@x86_64:buster:
extends:
- debian:stretch@check@x86_64
- debian:buster@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
......@@ -287,7 +287,7 @@ check labels debian@x86_64:stretch:
- '[[ x"$IMAGE_PROJECT" == x"$CI_PROJECT_PATH" ]]'
- '[[ x"$IMAGE_COMMIT" == x"$CI_COMMIT_SHA" ]]'
needs:
- debian:stretch@container-build@x86_64
- debian:buster@container-build@x86_64
#
......@@ -295,7 +295,7 @@ check labels debian@x86_64:stretch:
# repository (during the check)
# special case where FDO_REPO_SUFFIX == ci_templates_test_upstream
#
pull upstream debian:stretch@container-build@x86_64:
pull upstream debian:buster@container-build@x86_64:
extends: .debian:ci@container-build@x86_64
stage: debian_check
variables:
......@@ -303,7 +303,7 @@ pull upstream debian:stretch@container-build@x86_64:
FDO_REPO_SUFFIX: debian/ci_templates_test_upstream
FDO_DISTRIBUTION_PACKAGES: 'this-package-should-not-exist'
needs:
- debian:stretch@container-build@x86_64
- debian:buster@container-build@x86_64
#
# Try our debian scripts with other versions and check
......@@ -321,14 +321,14 @@ debian:sid@check@x86_64:
needs:
- debian:sid@container-build@x86_64
debian:buster@container-build@x86_64:
debian:stretch@container-build@x86_64:
extends: .debian:ci@container-build@x86_64
variables:
FDO_DISTRIBUTION_VERSION: 'buster'
FDO_DISTRIBUTION_VERSION: 'stretch'
debian:buster@check@x86_64:
debian:stretch@check@x86_64:
extends: .debian@check@x86_64
variables:
FDO_DISTRIBUTION_VERSION: 'buster'
FDO_DISTRIBUTION_VERSION: 'stretch'
needs:
- debian:buster@container-build@x86_64
- debian:stretch@container-build@x86_64
......@@ -2,9 +2,9 @@ debian:
distribution: debian
package_type: debs
versions:
- stretch
- sid
- buster
- sid
- stretch
aarch64: true
......
......@@ -251,7 +251,7 @@
# extends: .fdo.container-build@debian@x86_64
# variables:
# FDO_DISTRIBUTION_PACKAGES: 'curl wget gcc valgrind'
# FDO_DISTRIBUTION_VERSION: 'stretch'
# FDO_DISTRIBUTION_VERSION: 'buster'
# FDO_DISTRIBUTION_TAG: '2020-03-20'
#
#
......@@ -267,7 +267,7 @@
#
# **This variable is required**
#
# The debian version to build, e.g. 'stretch', 'sid', 'buster'
# The debian version to build, e.g. 'buster', 'sid', 'stretch'
#
# .. attribute:: FDO_DISTRIBUTION_TAG
#
......@@ -527,7 +527,7 @@
# my-debian-test:
# extends: .fdo.distribution-image@debian
# variables:
# FDO_DISTRIBUTION_VERSION: 'stretch'
# FDO_DISTRIBUTION_VERSION: 'buster'
# FDO_DISTRIBUTION_TAG: '2020-03-20'
# script:
# - meson builddir
......@@ -539,7 +539,7 @@
#
# **This variable is required**
#
# The debian version to build, e.g. 'stretch', 'sid', 'buster'
# The debian version to build, e.g. 'buster', 'sid', 'stretch'
#
# The value supplied must be the same as supplied in
# ``.fdo.container-build@debian@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