Commit 351c149c authored by Peter Hutterer's avatar Peter Hutterer
Browse files

Swap the Fedora versions to run qemu tests on 33



The first entry in this field is the one used for the qemu mkosi tests, so
let's use the latest version here.

And drop 34, its only effect here is an entry in the version examples in the
doc.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 6408b1a6
......@@ -24,7 +24,7 @@ stages:
variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_VERSION: '33'
FDO_EXPIRES_AFTER: '1h'
.ci-commons-fedora@x86_64:
......@@ -130,30 +130,30 @@ stages:
#
# straight fedora build and test
#
fedora:32@container-build@x86_64:
fedora:33@container-build@x86_64:
extends: .fedora:ci@container-build@x86_64
fedora:32@check@x86_64:
fedora:33@check@x86_64:
extends: .fedora@check@x86_64
needs:
- fedora:32@container-build@x86_64
- fedora:33@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.
fedora:32@base-image@x86_64:
extends: fedora:32@container-build@x86_64
fedora:33@base-image@x86_64:
extends: fedora:33@container-build@x86_64
stage: fedora_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/fedora/32:fdo-ci-x86_64-$CI_PIPELINE_ID
FDO_BASE_IMAGE: registry.freedesktop.org/$CI_PROJECT_PATH/fedora/33: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:
- fedora:32@container-build@x86_64
- fedora:33@container-build@x86_64
#
# /cache fedora check (in build stage)
......@@ -209,23 +209,23 @@ fedora@cache-check@x86_64:
artifacts: true
fedora:32@container-build@aarch64:
fedora:33@container-build@aarch64:
extends: .fedora:ci@container-build@aarch64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-aarch64-$CI_PIPELINE_ID
fedora:32@check@aarch64:
fedora:33@check@aarch64:
extends: .fedora@check@x86_64
tags:
- aarch64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-aarch64-$CI_PIPELINE_ID
needs:
- fedora:32@container-build@aarch64
- fedora:33@container-build@aarch64
fedora:32@qemu-build@x86_64:
fedora:33@qemu-build@x86_64:
extends: .fedora:ci@qemu-build@x86_64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
......@@ -233,33 +233,33 @@ fedora:32@qemu-build@x86_64:
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-18.2
fedora:32@qemu-check@x86_64:
fedora:33@qemu-check@x86_64:
extends: .fedora@qemu-check@x86_64
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
needs:
- fedora:32@qemu-build@x86_64
- fedora:33@qemu-build@x86_64
#
# make sure we do not rebuild the image if the tag exists (during the check)
#
do not rebuild fedora:32@container-build@x86_64:
do not rebuild fedora:33@container-build@x86_64:
extends: .fedora:ci@container-build@x86_64
stage: fedora_check
variables:
FDO_UPSTREAM_REPO: $CI_PROJECT_PATH
FDO_DISTRIBUTION_PACKAGES: 'this-package-should-not-exist'
needs:
- fedora:32@container-build@x86_64
- fedora:33@container-build@x86_64
#
# check if the labels were correctly applied
#
check labels fedora@x86_64:32:
check labels fedora@x86_64:33:
extends:
- fedora:32@check@x86_64
- fedora:33@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 fedora@x86_64:32:
- '[[ x"$IMAGE_PROJECT" == x"$CI_PROJECT_PATH" ]]'
- '[[ x"$IMAGE_COMMIT" == x"$CI_COMMIT_SHA" ]]'
needs:
- fedora:32@container-build@x86_64
- fedora:33@container-build@x86_64
#
......@@ -295,7 +295,7 @@ check labels fedora@x86_64:32:
# repository (during the check)
# special case where FDO_REPO_SUFFIX == ci_templates_test_upstream
#
pull upstream fedora:32@container-build@x86_64:
pull upstream fedora:33@container-build@x86_64:
extends: .fedora:ci@container-build@x86_64
stage: fedora_check
variables:
......@@ -303,32 +303,20 @@ pull upstream fedora:32@container-build@x86_64:
FDO_REPO_SUFFIX: fedora/ci_templates_test_upstream
FDO_DISTRIBUTION_PACKAGES: 'this-package-should-not-exist'
needs:
- fedora:32@container-build@x86_64
- fedora:33@container-build@x86_64
#
# Try our fedora scripts with other versions and check
#
fedora:33@container-build@x86_64:
extends: .fedora:ci@container-build@x86_64
variables:
FDO_DISTRIBUTION_VERSION: '33'
fedora:33@check@x86_64:
extends: .fedora@check@x86_64
variables:
FDO_DISTRIBUTION_VERSION: '33'
needs:
- fedora:33@container-build@x86_64
fedora:34@container-build@x86_64:
fedora:32@container-build@x86_64:
extends: .fedora:ci@container-build@x86_64
variables:
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_VERSION: '32'
fedora:34@check@x86_64:
fedora:32@check@x86_64:
extends: .fedora@check@x86_64
variables:
FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_VERSION: '32'
needs:
- fedora:34@container-build@x86_64
- fedora:32@container-build@x86_64
......@@ -2,9 +2,8 @@ fedora:
distribution: fedora
package_type: rpms
versions:
- '32'
- '33'
- '34' # rawhide
- '32'
aarch64: true
......
......@@ -231,7 +231,7 @@
# extends: .fdo.container-build@fedora@x86_64
# variables:
# FDO_DISTRIBUTION_PACKAGES: 'curl wget gcc valgrind'
# FDO_DISTRIBUTION_VERSION: '32'
# FDO_DISTRIBUTION_VERSION: '33'
# FDO_DISTRIBUTION_TAG: '2020-03-20'
#
#
......@@ -247,7 +247,7 @@
#
# **This variable is required**
#
# The fedora version to build, e.g. '32', '33', '34'
# The fedora version to build, e.g. '33', '32'
#
# .. attribute:: FDO_DISTRIBUTION_TAG
#
......@@ -508,7 +508,7 @@
# my-fedora-test:
# extends: .fdo.distribution-image@fedora
# variables:
# FDO_DISTRIBUTION_VERSION: '32'
# FDO_DISTRIBUTION_VERSION: '33'
# FDO_DISTRIBUTION_TAG: '2020-03-20'
# script:
# - meson builddir
......@@ -520,7 +520,7 @@
#
# **This variable is required**
#
# The fedora version to build, e.g. '32', '33', '34'
# The fedora version to build, e.g. '33', '32'
#
# The value supplied must be the same as supplied in
# ``.fdo.container-build@fedora@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