diff --git a/azure-pipelines-internal-tests.yml b/azure-pipelines-internal-tests.yml index ef88dc4ef13..18e782cabb4 100644 --- a/azure-pipelines-internal-tests.yml +++ b/azure-pipelines-internal-tests.yml @@ -230,7 +230,49 @@ extends: - name: _HelixBuildConfig value: $(_BuildConfig) - name: HelixTargetQueues - value: Windows.10.Amd64 + value: Windows.11.Amd64.Client + - name: _HelixAccessToken + value: $(HelixApiAccessToken) + steps: + - task: NuGetCommand@2 + displayName: 'Clear NuGet caches' + condition: succeeded() + inputs: + command: custom + arguments: 'locals all -clear' + - template: /eng/common/templates-official/steps/enable-internal-sources.yml + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml + - template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: 'dotnetbuilds-internal-read' + outputVariableName: 'dotnetbuilds-internal-container-read-token' + expiryInHours: 3 + base64Encode: false + storageAccount: dotnetbuilds + container: internal + permissions: rl + - script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs) + displayName: Restore packages + - script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs) + displayName: Send tests to helix + env: + HelixAccessToken: $(_HelixAccessToken) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) + + - job: Helix_Windows_Cosmos + displayName: 'Helix Windows Cosmos' + timeoutInMinutes: 180 + pool: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals 1es-windows-2022 + os: windows + variables: + - skipComponentGovernanceDetection: true + - name: _HelixBuildConfig + value: $(_BuildConfig) + - name: HelixTargetQueues + value: Windows.Server2025.Amd64 - name: _HelixAccessToken value: $(HelixApiAccessToken) steps: diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml index 500c7be10b8..c62b0ed3b3d 100644 --- a/azure-pipelines-public.yml +++ b/azure-pipelines-public.yml @@ -152,7 +152,37 @@ stages: - name: _HelixBuildConfig value: $(_BuildConfig) - name: HelixTargetQueues - value: Windows.10.Amd64.Open + value: Windows.11.Amd64.Client.Open + - name: _HelixAccessToken + value: '' + steps: + - task: NuGetCommand@2 + displayName: 'Clear NuGet caches' + condition: succeeded() + inputs: + command: custom + arguments: 'locals all -clear' + - script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs) + displayName: Restore packages + - script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs) + displayName: Send tests to helix + env: + HelixAccessToken: $(_HelixAccessToken) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + + - job: Helix_Windows_Cosmos + displayName: 'Helix Windows Cosmos' + timeoutInMinutes: 180 + pool: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals 1es-windows-2022-open + variables: + - skipComponentGovernanceDetection: true + - Codeql.SkipTaskAutoInjection: true + - name: _HelixBuildConfig + value: $(_BuildConfig) + - name: HelixTargetQueues + value: Windows.Server2025.Amd64.Open - name: _HelixAccessToken value: '' steps: diff --git a/eng/helix.proj b/eng/helix.proj index da0da19701a..d6e9e084e41 100644 --- a/eng/helix.proj +++ b/eng/helix.proj @@ -18,7 +18,7 @@ - Windows.10.Amd64.Open;OSX.15.Amd64.Open;OSX.15.ARM64.Open;Ubuntu.2204.Amd64.XL.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64;Ubuntu.2204.Amd64.XL.Open;Ubuntu.2204.Amd64.Open + Windows.11.Amd64.Client.Open;Windows.Server2025.Amd64.Open;OSX.15.Amd64.Open;OSX.15.ARM64.Open;Ubuntu.2204.Amd64.XL.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64;Ubuntu.2204.Amd64.XL.Open;Ubuntu.2204.Amd64.Open false efcore/localbuild/ t001 @@ -72,8 +72,10 @@ - - $(PreCommands); set Test__Cosmos__SkipConnectionCheck=true + + + + $(PreCommands); echo === Starting Cosmos Emulator ===; echo Waiting 120s for emulator startup...; powershell -Command "Start-Sleep -Seconds 120"; set Test__Cosmos__DefaultConnection=https://localhost:8081; set Test__Cosmos__SkipConnectionCheck=true