From 7f81333f7142eae799ec46f22ef648b62f9dd592 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Fri, 27 May 2022 09:24:33 -0700
Subject: [PATCH] CI: Re-enable Windows builds

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16756>
---
 .gitlab-ci.yml                      | 2 +-
 .gitlab-ci/build/gitlab-ci.yml      | 2 +-
 .gitlab-ci/container/gitlab-ci.yml  | 2 +-
 .gitlab-ci/image-tags.yml           | 4 ++--
 .gitlab-ci/windows/Dockerfile_build | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5fb25d3771819..80d23006871f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # running on a particular CI farm (ie. for outages, etc):
   FD_FARM: "online"
   COLLABORA_FARM: "online"
-  MICROSOFT_FARM: "offline"
+  MICROSOFT_FARM: "online"
   LIMA_FARM: "online"
 
 default:
diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index e49f62e11999b..bc9fc9a3dfa0a 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -37,7 +37,7 @@
   tags:
     - windows
     - docker
-    - "1809"
+    - "2022"
     - mesa
   cache:
     key: ${CI_JOB_NAME}
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 9aaf567270a48..d1b1f077b0e54 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -361,7 +361,7 @@ debian/arm_test:
   tags:
     - windows
     - shell
-    - "1809"
+    - "2022"
     - mesa
   script:
     - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE}
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index fe760d3737451..15bc3ec7fd88c 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -15,7 +15,7 @@ variables:
    KERNEL_ROOTFS_TAG: "2022-05-31-cts-1.3.2.0"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
-   WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"
+   WINDOWS_X64_BUILD_TAG: "2022-27-05-server_2022"
 
    WINDOWS_X64_TEST_PATH: "windows/x64_test"
-   WINDOWS_X64_TEST_TAG: "2022-04-13-dozen_ci"
+   WINDOWS_X64_TEST_TAG: "2022-27-05-server_2022"
diff --git a/.gitlab-ci/windows/Dockerfile_build b/.gitlab-ci/windows/Dockerfile_build
index f940504243dcd..9dbdfff38d03b 100644
--- a/.gitlab-ci/windows/Dockerfile_build
+++ b/.gitlab-ci/windows/Dockerfile_build
@@ -1,6 +1,6 @@
 # escape=`
 
-FROM mcr.microsoft.com/windows:1809
+FROM mcr.microsoft.com/windows/server:ltsc2022
 
 # Make sure any failure in PowerShell scripts is fatal
 SHELL ["powershell", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]