Commit cf951872 authored by Bastien Nocera's avatar Bastien Nocera
Browse files

ci: Update CI after the fdo template changes

The CI definition needs to be updated to work with the new fdo
templates.

Adapted from libfprint/libfprint@bd4f118b
parent 23c37cd9
...@@ -8,9 +8,9 @@ include: ...@@ -8,9 +8,9 @@ include:
variables: variables:
extends: .libfprint_common_variables extends: .libfprint_common_variables
FEDORA_TAG: rawhide FDO_DISTRIBUTION_TAG: latest
FEDORA_VERSION: rawhide FDO_DISTRIBUTION_VERSION: rawhide
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG" FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
DEPENDENCIES: dbus-glib-devel DEPENDENCIES: dbus-glib-devel
gcc gcc
gcovr gcovr
...@@ -85,13 +85,13 @@ test_dev: ...@@ -85,13 +85,13 @@ test_dev:
# CONTAINERS creation stage # CONTAINERS creation stage
container_fedora_build: container_fedora_build:
extends: .fedora@container-build extends: .fdo.container-build@fedora
only: only:
variables: variables:
- $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
# a list of packages to install # a list of packages to install
FEDORA_RPMS: FDO_DISTRIBUTION_PACKAGES:
$DEPENDENCIES $DEPENDENCIES
$LIBFPRINT_DEPENDENCIES $LIBFPRINT_DEPENDENCIES
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