From a436b276f787822ed8a0e70056d7c9d8d7e0410a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Wed, 14 Apr 2021 14:34:16 +0200
Subject: [PATCH] ci: Do not append ci-templates commit hash to Windows docker
 image tag

We're not using the templates for the Windows image.

Fixes needless rebuild of the Windows image when the ci-templates
commit is changed.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c874aafb04..cfff8e07ff0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -503,9 +503,10 @@ arm_test:
   extends:
     - .set-image
   variables:
+    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
     MESA_IMAGE_PATH: "windows/x64_build"
     MESA_IMAGE_TAG: "2021-03-15-tls"
-    MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
 
 windows_build_vs2019:
   extends: