fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-27 13:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: name the qemu tags per distribution

Browse source 
Having only one qemu tag worked only because we only had one
distribution using qemu. If we have multiple of those we just
duplicate/overwrite the variable so let's not do that.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-07-26 10:47:18 +10:00
parent ad239327c0
commit 6516374ded
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -102,7 +102,7 @@ variables:
ARCH_TAG: '2021-05-12.0'
ALPINE_TAG: '2021-05-12.0'
FREEBSD_TAG: '2021-05-12.0'
QEMU_TAG: 'qemu-vm-2021-05-12.0'
FEDORA_QEMU_TAG: 'fedora-qemu-vm-2021-05-12.0'
FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG
FDO_UPSTREAM_REPO: libinput/libinput
@ -193,7 +193,7 @@ fedora:34@qemu-prep:
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: 34
FDO_DISTRIBUTION_TAG: $QEMU_TAG
FDO_DISTRIBUTION_TAG: $FEDORA_QEMU_TAG
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
fedora:33@container-prep:
@ -519,7 +519,7 @@ freebsd:11.2@container-clean:
- .test-suite-vm
variables:
FDO_DISTRIBUTION_VERSION: 34
FDO_DISTRIBUTION_TAG: $QEMU_TAG
FDO_DISTRIBUTION_TAG: $FEDORA_QEMU_TAG
needs:
- "fedora:34@qemu-prep"

6
.gitlab-ci/ci.template
View file

@ -88,7 +88,7 @@ variables:
{% endfor %}
{% for distro in distributions %}
{% if distro.want_qemu %}
QEMU_TAG: 'qemu-vm-{{distro.tag}}'
{{"%-20s"| format(distro.name.upper() + '_QEMU_TAG:')}} '{{distro.name}}-qemu-vm-{{distro.tag}}'
{% endif %}
{% endfor %}
@ -184,7 +184,7 @@ check-commit:
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: {{version}}
FDO_DISTRIBUTION_TAG: $QEMU_TAG
FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_QEMU_TAG
FDO_DISTRIBUTION_PACKAGES: ${{distro.name.upper()}}_PACKAGES
{% endfor %}
@ -402,7 +402,7 @@ freebsd:11.2@container-clean:
- .test-suite-vm
variables:
FDO_DISTRIBUTION_VERSION: {{version}}
FDO_DISTRIBUTION_TAG: $QEMU_TAG
FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_QEMU_TAG
needs:
- "{{distro.name}}:{{version}}@qemu-prep"