diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-07-26 10:47:18 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-07-28 08:59:09 +1000 |
| commit | 6516374ded3f17986df906b650931e98730da14d (patch) | |
| tree | d80c77fbe6982d20c78ec65baffb8c9738491609 /.gitlab-ci | |
| parent | ad239327c0a0ccc1925cf7e874ad0f9aaab92361 (diff) | |
| download | libinput-6516374ded3f17986df906b650931e98730da14d.tar.gz | |
gitlab CI: name the qemu tags per distribution
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>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/ci.template | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index c7bfe4bc..d7950913 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -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" |