ci: Update to new FDO templates

This commit is contained in:
Benjamin Berg
2021-09-15 16:30:08 +02:00
parent b483edbe92
commit 3d309ea400

View File

@ -2,7 +2,7 @@ include:
- project: 'libfprint/libfprint' - project: 'libfprint/libfprint'
ref: master ref: master
file: '/.gitlab-ci/libfprint-templates.yaml' file: '/.gitlab-ci/libfprint-templates.yaml'
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: master ref: master
file: '/templates/fedora.yml' file: '/templates/fedora.yml'
@ -10,7 +10,7 @@ variables:
extends: .libfprint_common_variables extends: .libfprint_common_variables
FDO_DISTRIBUTION_TAG: latest FDO_DISTRIBUTION_TAG: latest
FDO_DISTRIBUTION_VERSION: rawhide FDO_DISTRIBUTION_VERSION: rawhide
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
DEPENDENCIES: dbus-glib-devel DEPENDENCIES: dbus-glib-devel
gcc gcc
gcovr gcovr
@ -27,14 +27,13 @@ variables:
python3-libpamtest python3-libpamtest
systemd-devel systemd-devel
image: "$FEDORA_IMAGE"
stages: stages:
- check-source - check-source
- build - build
- test - test
.fprintd_build_preconditions: .fprintd_build_preconditions:
extends: .fdo.distribution-image@fedora
except: except:
variables: variables:
- $FPRINT_CRON_TASK == "BUILD_CI_IMAGES" - $FPRINT_CRON_TASK == "BUILD_CI_IMAGES"
@ -123,6 +122,7 @@ container_fedora_build:
- $FPRINT_CRON_TASK == "BUILD_CI_IMAGES" - $FPRINT_CRON_TASK == "BUILD_CI_IMAGES"
variables: variables:
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
FDO_FORCE_REBUILD: 1
# a list of packages to install # a list of packages to install
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
$DEPENDENCIES $DEPENDENCIES