fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2026-05-09 07:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: Use the new fdo CI templates distribution images

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-03-06 14:24:58 +10:00
parent 1b1b446597
commit bd8225286a
2 changed files with 26 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
.gitlab-ci.yml
View file

@ -4,31 +4,31 @@
# # # #
######################################## ########################################
.templates_sha: &template_sha df52af2195b052325daf5d715c88be90f8ec7d86 # see https://docs.gitlab.com/ee/ci/yaml/#includefile .templates_sha: &template_sha 2469555cd0a6b621b988e100ddd746c2ad0cdd1d # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include: include:
# Alpine container builder template # Alpine container builder template
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/alpine.yml' file: '/templates/alpine.yml'
# Arch container builder template # Arch container builder template
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/arch.yml' file: '/templates/arch.yml'
# Centos container builder template # Centos container builder template
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/centos.yml' file: '/templates/centos.yml'
# Debian container builder template # Debian container builder template
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/debian.yml' file: '/templates/debian.yml'
# Fedora container builder template # Fedora container builder template
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/fedora.yml' file: '/templates/fedora.yml'
# Ubuntu container builder template # Ubuntu container builder template
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/ubuntu.yml' file: '/templates/ubuntu.yml'
@ -76,81 +76,63 @@ variables:
script: script:
- .gitlab-ci/meson-build.sh - .gitlab-ci/meson-build.sh
# Base image for a given distribution, provides
# - the image of that distribution
# - DISTRO_CONTAINER_IMAGE for any manipulation the job needs to be
.distribution_image:
image: $CI_REGISTRY_IMAGE/$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
variables:
DISTRO_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
.fedora:30: .fedora:30:
extends: .distribution_image extends: .fdo.distribution_image@fedora
variables: variables:
DISTRIB_NAME: 'fedora'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: '30' FDO_DISTRIBUTION_VERSION: '30'
.fedora:31: .fedora:31:
extends: .distribution_image extends: .fdo.distribution_image@fedora
variables: variables:
DISTRIB_NAME: 'fedora'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: '31' FDO_DISTRIBUTION_VERSION: '31'
.ubuntu:19.10: .ubuntu:19.10:
extends: .distribution_image extends: .fdo.distribution_image@ubuntu
variables: variables:
DISTRIB_NAME: 'ubuntu'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: '19.10' FDO_DISTRIBUTION_VERSION: '19.10'
.ubuntu:19.04: .ubuntu:19.04:
extends: .distribution_image extends: .fdo.distribution_image@ubuntu
variables: variables:
DISTRIB_NAME: 'ubuntu'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: '19.04' FDO_DISTRIBUTION_VERSION: '19.04'
.debian:stable: .debian:stable:
extends: .distribution_image extends: .fdo.distribution_image@debian
variables: variables:
DISTRIB_NAME: 'debian'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: 'stable' FDO_DISTRIBUTION_VERSION: 'stable'
.debian:sid: .debian:sid:
extends: .distribution_image extends: .fdo.distribution_image@debian
variables: variables:
DISTRIB_NAME: 'debian'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: 'sid' FDO_DISTRIBUTION_VERSION: 'sid'
.centos:7: .centos:7:
extends: .distribution_image extends: .fdo.distribution_image@centos
variables: variables:
DISTRIB_NAME: 'centos'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: '7' FDO_DISTRIBUTION_VERSION: '7'
.centos:8: .centos:8:
extends: .distribution_image extends: .fdo.distribution_image@centos
variables: variables:
DISTRIB_NAME: 'centos'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: '8' FDO_DISTRIBUTION_VERSION: '8'
.arch:rolling: .arch:rolling:
extends: .distribution_image extends: .fdo.distribution_image@arch
variables: variables:
DISTRIB_NAME: 'arch'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: 'rolling' FDO_DISTRIBUTION_VERSION: 'rolling'
.alpine:latest: .alpine:latest:
extends: .distribution_image extends: .fdo.distribution_image@alpine
variables: variables:
DISTRIB_NAME: 'alpine'
FDO_DISTRIBUTION_TAG: '2020-03-06.0' FDO_DISTRIBUTION_TAG: '2020-03-06.0'
FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_VERSION: 'latest'
@ -209,7 +191,7 @@ check-commit:
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# get the full container image name (FDO_DISTRIBUTION_VERSION still has indirections) # get the full container image name (FDO_DISTRIBUTION_VERSION still has indirections)
- IMAGE=$(eval echo "$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG") - IMAGE=$(eval echo "$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG")
- | - |
# force rebuild if schedule, reuse otherwise # force rebuild if schedule, reuse otherwise
@ -401,7 +383,7 @@ alpine:latest@container-prep:
# Define a variable of type File named AUTHFILE. Content is that token # Define a variable of type File named AUTHFILE. Content is that token
# value. # value.
- python3 .gitlab-ci/gitlab-container-delete $CI_SERVER_URL $CI_PROJECT_PATH - python3 .gitlab-ci/gitlab-container-delete $CI_SERVER_URL $CI_PROJECT_PATH
--repository $DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION --repository $FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION
--authfile $AUTHFILE --exclude-tag "$LATEST_TAG" --authfile $AUTHFILE --exclude-tag "$LATEST_TAG"
dependencies: [] dependencies: []
allow_failure: true allow_failure: true
@ -778,8 +760,7 @@ soname:
extends: extends:
- .fedora:31 - .fedora:31
stage: VM stage: VM
image: image: $CI_REGISTRY_IMAGE/$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG
$CI_REGISTRY_IMAGE/$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG
tags: tags:
- kvm - kvm
variables: variables:

22
.gitlab-ci/gitlab-ci.tmpl
View file

@ -6,12 +6,12 @@
# # # #
######################################## ########################################
.templates_sha: &template_sha df52af2195b052325daf5d715c88be90f8ec7d86 # see https://docs.gitlab.com/ee/ci/yaml/#includefile .templates_sha: &template_sha 2469555cd0a6b621b988e100ddd746c2ad0cdd1d # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include: include:
{% for distribution in distributions|map(attribute='name')|unique()|sort() %} {% for distribution in distributions|map(attribute='name')|unique()|sort() %}
# {{ distribution.capitalize() }} container builder template # {{ distribution.capitalize() }} container builder template
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/{{distribution}}.yml' file: '/templates/{{distribution}}.yml'
{% endfor %} {% endfor %}
@ -60,23 +60,14 @@ variables:
script: script:
- .gitlab-ci/meson-build.sh - .gitlab-ci/meson-build.sh
# Base image for a given distribution, provides
# - the image of that distribution
# - DISTRO_CONTAINER_IMAGE for any manipulation the job needs to be
.distribution_image:
image: $CI_REGISTRY_IMAGE/$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
variables:
DISTRO_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
{# Generate templates for every distribution/version combination we want, any {# Generate templates for every distribution/version combination we want, any
job can then just extends: .name:version and the images will sort job can then just extends: .name:version and the images will sort
themselves out. #} themselves out. #}
{% for distro in distributions %} {% for distro in distributions %}
{% for version in distro.versions %} {% for version in distro.versions %}
.{{distro.name}}:{{version}}: .{{distro.name}}:{{version}}:
extends: .distribution_image extends: .fdo.distribution_image@{{distro.name}}
variables: variables:
DISTRIB_NAME: '{{distro.name}}'
FDO_DISTRIBUTION_TAG: '{{distro.tag}}' FDO_DISTRIBUTION_TAG: '{{distro.tag}}'
FDO_DISTRIBUTION_VERSION: '{{version}}' FDO_DISTRIBUTION_VERSION: '{{version}}'
@ -137,7 +128,7 @@ check-commit:
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# get the full container image name (FDO_DISTRIBUTION_VERSION still has indirections) # get the full container image name (FDO_DISTRIBUTION_VERSION still has indirections)
- IMAGE=$(eval echo "$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG") - IMAGE=$(eval echo "$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG")
- | - |
# force rebuild if schedule, reuse otherwise # force rebuild if schedule, reuse otherwise
@ -217,7 +208,7 @@ fedora:31@qemu-prep:
# Define a variable of type File named AUTHFILE. Content is that token # Define a variable of type File named AUTHFILE. Content is that token
# value. # value.
- python3 .gitlab-ci/gitlab-container-delete $CI_SERVER_URL $CI_PROJECT_PATH - python3 .gitlab-ci/gitlab-container-delete $CI_SERVER_URL $CI_PROJECT_PATH
--repository $DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION --repository $FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION
--authfile $AUTHFILE --exclude-tag "$LATEST_TAG" --authfile $AUTHFILE --exclude-tag "$LATEST_TAG"
dependencies: [] dependencies: []
allow_failure: true allow_failure: true
@ -428,8 +419,7 @@ soname:
extends: extends:
- .fedora:31 - .fedora:31
stage: VM stage: VM
image: image: $CI_REGISTRY_IMAGE/$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG
$CI_REGISTRY_IMAGE/$DISTRIB_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG
tags: tags:
- kvm - kvm
variables: variables: