Update common Docker engineering infrastructure with latest

dotnet · Oct 1, 2024 · fe6d799 · fe6d799
1 parent 4575fe5
commit fe6d799
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 2 deletions.
diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/common/Install-DotNetSdk.ps1
@@ -40,7 +40,7 @@ if (!(Test-Path $DotnetInstallScriptPath)) {
  & "$PSScriptRoot/Invoke-WithRetry.ps1" "Invoke-WebRequest 'https://dot.net/v1/$DotnetInstallScript' -OutFile $DotnetInstallScriptPath"
 }
 
-$DotnetChannel = "8.0"
+$DotnetChannel = "9.0"
 
 $InstallFailed = $false
 if ($IsRunningOnUnix) {

diff --git a/eng/common/templates/stages/build-test-publish-repo.yml b/eng/common/templates/stages/build-test-publish-repo.yml
@@ -37,6 +37,8 @@ parameters:
  vmImage: $(defaultWindows1809PoolImage)
  windows2022Pool:
  vmImage: $(defaultWindows2022PoolImage)
+ windows2025Pool:
+ vmImage: $(defaultWindows2025PoolImage)
 
 stages:
 
@@ -144,6 +146,19 @@ stages:
  publicProjectName: ${{ parameters.publicProjectName }}
  internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
  publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
+ - template: /eng/common/templates/jobs/build-images.yml@self
+ parameters:
+ name: Windows2025_amd64
+ pool: ${{ parameters.windows2025Pool }}
+ matrix: dependencies.GenerateBuildMatrix.outputs['matrix.WindowsLtsc2025Amd64']
+ dockerClientOS: windows
+ buildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }}
+ customInitSteps: ${{ parameters.customBuildInitSteps }}
+ noCache: ${{ parameters.noCache }}
+ internalProjectName: ${{ parameters.internalProjectName }}
+ publicProjectName: ${{ parameters.publicProjectName }}
+ internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }}
+ publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }}
  - template: /eng/common/templates/jobs/build-images.yml@self
  parameters:
  name: WindowsLtsc2016_amd64
@@ -237,6 +252,14 @@ stages:
  testJobTimeout: ${{ parameters.windowsAmdTestJobTimeout }}
  internalProjectName: ${{ parameters.internalProjectName }}
  customInitSteps: ${{ parameters.customTestInitSteps }}
+ - template: /eng/common/templates/jobs/test-images-windows-client.yml@self
+ parameters:
+ name: Windows2025_amd64
+ pool: ${{ parameters.windows2025Pool }}
+ matrix: dependencies.GenerateTestMatrix.outputs['matrix.WindowsLtsc2025Amd64']
+ testJobTimeout: ${{ parameters.windowsAmdTestJobTimeout }}
+ internalProjectName: ${{ parameters.internalProjectName }}
+ customInitSteps: ${{ parameters.customTestInitSteps }}
  - template: /eng/common/templates/jobs/test-images-windows-client.yml@self
  parameters:
  name: WindowsLtsc2016_amd64

diff --git a/eng/common/templates/stages/dotnet/build-test-publish-repo.yml b/eng/common/templates/stages/dotnet/build-test-publish-repo.yml
@@ -120,3 +120,12 @@ stages:
  image: $(windowsServer2022PublicPoolImage)
  ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
  image: $(windowsServer2022InternalPoolImage)
+
+ # Windows Server 2025
+ windows2025Pool:
+ os: windows
+ name: $(windowsServer2025PoolName)
+ ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
+ image: $(windowsServer2025PublicPoolImage)
+ ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
+ image: $(windowsServer2025InternalPoolImage)
diff --git a/eng/common/templates/variables/common.yml b/eng/common/templates/variables/common.yml
@@ -57,6 +57,8 @@ variables:
  value: windows-2019
 - name: defaultWindows2022PoolImage
  value: windows-2022
+- name: defaultWindows2025PoolImage
+ value: windows-2025
 
 - name: default1ESInternalPoolName
  value: NetCore1ESPool-Internal

diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
- imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2543116
+ imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2546747
  imageNames.imageBuilder: $(imageNames.imageBuilderName)
  imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
  imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner

diff --git a/eng/common/templates/variables/dotnet/common.yml b/eng/common/templates/variables/dotnet/common.yml
@@ -47,6 +47,13 @@ variables:
 - name: windowsServer2022PoolName
  value: Docker-2022-${{ variables['System.TeamProject'] }}
 
+- name: windowsServer2025PublicPoolImage
+ value: Server2025-NESDockerBuilds
+- name: windowsServer2025InternalPoolImage
+ value: Server2025-NESDockerBuilds-1ESPT
+- name: windowsServer2025PoolName
+ value: Docker-2025-${{ variables['System.TeamProject'] }}
+
 - group: DotNet-Docker-Common
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
  - group: DotNet-Docker-Secrets-WIF