Nothing's ever easy, is it

DataDog · Feb 11, 2025 · dda17b3 · dda17b3
1 parent 66873b2
commit dda17b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml
@@ -6679,7 +6679,7 @@ stages:
       variables:
         smokeTestAppDir: "$(System.DefaultWorkingDirectory)/tracer/test/test-applications/regression/AspNetCoreSmokeTest"
       pool:
-        vmImage: $(vmImage)
+        vmImage: windows-$(windowsYear)
 
       steps:
         - template: steps/install-docker-compose-v1.yml
@@ -6712,7 +6712,7 @@ stages:
 
         - bash: |
             $(dockerComposePath) -f docker-compose.windows.yml -p $(DockerComposeProjectName) build \
-              --build-arg DOTNETSDK_VERSION=$(dotnetCoreSdkLatestVersionShort) \
+              --build-arg BUILD_IMAGE_TAG="$(dotnetCoreSdkLatestVersionShort)-windowsservercore-ltsc$(windowsYear)" \
               --build-arg RUNTIME_IMAGE=$(runtimeImage) \
               --build-arg PUBLISH_FRAMEWORK=$(publishFramework) \
               --build-arg CHANNEL="$(channel)" \

diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
@@ -163,7 +163,7 @@ services:
       dockerfile: build/_build/docker/smoke.windows.fleet-installer.dockerfile
         # args:
         # Note that the following build arguments must be provided
-        # - DOTNETSDK_VERSION=
+        # - BUILD_IMAGE_TAG=
         # - RUNTIME_IMAGE=
         # - PUBLISH_FRAMEWORK=
         # - CHANNEL=

diff --git a/tracer/build/_build/Build.VariableGenerations.cs b/tracer/build/_build/Build.VariableGenerations.cs
@@ -1271,7 +1271,7 @@ from image in runtimeImages
                                          runtimeImage = $"{dockerName}:{image.RuntimeTag}",
                                          targetPlatform = platform,
                                          channel = GetInstallerChannel(image.PublishFramework),
-                                         vmImage = $"windows-{image.RuntimeTag.Substring(image.RuntimeTag.Length - 4)}",
+                                         windowsYear = image.RuntimeTag.Substring(image.RuntimeTag.Length - 4),
                                      }).ToDictionary(x=>x.dockerTag, x => x);
 
                     Logger.Information($"Installer smoke tests fleet-installer matrix Windows");

diff --git a/tracer/build/_build/docker/smoke.windows.fleet-installer.dockerfile b/tracer/build/_build/docker/smoke.windows.fleet-installer.dockerfile
@@ -1,8 +1,8 @@
-ARG DOTNETSDK_VERSION
+ARG BUILD_IMAGE_TAG
 ARG RUNTIME_IMAGE
 
 # Build the ASP.NET Core app using the latest SDK
-FROM mcr.microsoft.com/dotnet/sdk:$DOTNETSDK_VERSION-windowsservercore-ltsc2022 as builder
+FROM mcr.microsoft.com/dotnet/sdk:$BUILD_IMAGE_TAG as builder
 
 # Build the smoke test app
 WORKDIR /src