summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2020-12-15 18:02:04 +0100
committerMarge Bot <eric+marge@anholt.net>2021-02-05 17:17:59 +0000
commit366fb28dacef2ef45702a9301b176190ac429e56 (patch)
treeea905e84a7911601ef48170c6730b507cb69d3ce /.gitlab-ci
parentd1f93261b17d73eceb16b7081000b5bb8f6608f2 (diff)
ci: Fix MESA_TEMPLATES_COMMIT value
The intention was to set it to the commit used for debian.yml, but I accidentally set it to the ci-fairy.yml commit instead. v2: * While we're at it, put two dashes between the base tag and the ci-templates commit hash, making them easier to tell apart. v3: * While we're at it, fix the year of some recently bumped tags. Fixes: 48f78dfd1ac1 "ci: Define global variable MESA_TEMPLATES_COMMIT for ci-templates commit" Reviewed-by: Eric Anholt <eric@anholt.net> # v2 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8690>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 09705623928..b73553223bf 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -19,7 +19,7 @@ kernel+rootfs_amd64:
extends:
- .use-x86_build-base
- .kernel+rootfs
- image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${MESA_BASE_TAG}-${MESA_TEMPLATES_COMMIT}"
+ image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
variables:
DEBIAN_ARCH: "amd64"