diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/common/Install-DotNetSdk.ps1 index ad675848..1ba23b6c 100644 --- a/eng/common/Install-DotNetSdk.ps1 +++ b/eng/common/Install-DotNetSdk.ps1 @@ -54,6 +54,6 @@ else { } # See https://github.com/NuGet/NuGet.Client/pull/4259 -$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000" +$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "6,1500" if ($InstallFailed) { throw "Failed to install the .NET Core SDK" } diff --git a/eng/common/templates/stages/build-test-publish-repo.yml b/eng/common/templates/stages/build-test-publish-repo.yml index 0a5b9ef3..e8309bed 100644 --- a/eng/common/templates/stages/build-test-publish-repo.yml +++ b/eng/common/templates/stages/build-test-publish-repo.yml @@ -91,6 +91,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} - template: /eng/common/templates/jobs/build-images.yml@self parameters: name: Linux_amd64 @@ -104,6 +105,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -122,6 +124,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -140,6 +143,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -158,6 +162,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -176,6 +181,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -194,12 +200,14 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} - template: /eng/common/templates/jobs/build-images.yml@self parameters: name: WindowsLtsc2016_amd64 @@ -213,6 +221,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} diff --git a/eng/common/templates/steps/common-init-for-matrix-and-build.yml b/eng/common/templates/steps/common-init-for-matrix-and-build.yml index 2f12a54d..ce34eaf2 100644 --- a/eng/common/templates/steps/common-init-for-matrix-and-build.yml +++ b/eng/common/templates/steps/common-init-for-matrix-and-build.yml @@ -3,6 +3,7 @@ parameters: internalVersionsRepoRef: null publicVersionsRepoRef: null versionsRepoPath: versions + isInternalServicingValidation: false steps: - checkout: self @@ -60,3 +61,14 @@ steps: echo "##vso[task.setvariable variable=versionsBasePath]$versionsBasePath" echo "##vso[task.setvariable variable=pipelineDisabledCache]$pipelineDisabledCache" displayName: Set Common Variables for Matrix and Build + +- ${{ if eq(parameters.noCache, false) }}: + # Special logic is needed to copy the tsaoptions.json file to a well known location for the 1ES PT. + # This template has multiple checkouts and AzDO doesn't have support for dynamically determining the + # default repo path therefore the 1es-official logic can't calculate the repo's tsa config file path. + - task: CopyFiles@2 + displayName: Copy TSA Config + inputs: + SourceFolder: '$(Build.Repository.LocalPath)/$(buildRepoName)' + Contents: '.config/tsaoptions.json' + TargetFolder: '$(Build.SourcesDirectory)' diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml index 69fd91ec..889f3144 100644 --- 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:2555712 + imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2561667 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/build-test-publish.yml b/eng/common/templates/variables/dotnet/build-test-publish.yml index 51e5dde3..ce88f4f2 100644 --- a/eng/common/templates/variables/dotnet/build-test-publish.yml +++ b/eng/common/templates/variables/dotnet/build-test-publish.yml @@ -12,7 +12,7 @@ variables: - name: testResultsDirectory value: tests/Microsoft.DotNet.Docker.Tests/TestResults/ - name: officialRepoPrefixes - value: public/,internal/private/ + value: public/,internal/private/,unlisted/ - name: mcrDocsRepoInfo.accessToken value: $(BotAccount-dotnet-docker-bot-PAT)