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.yml | |
| parent | ad239327c0a0ccc1925cf7e874ad0f9aaab92361 (diff) | |
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.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31e778d5..65e9bb5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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" |