Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update common Docker engineering infrastructure with latest #1182

Merged
merged 1 commit into from
Oct 22, 2024
Merged

[main] Update common Docker engineering infrastructure with latest #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/common/Install-DotNetSdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
9 changes: 9 additions & 0 deletions eng/common/templates/stages/build-test-publish-repo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
12 changes: 12 additions & 0 deletions eng/common/templates/steps/common-init-for-matrix-and-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ parameters:
internalVersionsRepoRef: null
publicVersionsRepoRef: null
versionsRepoPath: versions
isInternalServicingValidation: false

steps:
- checkout: self
Expand Down Expand Up @@ -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)'
2 changes: 1 addition & 1 deletion eng/common/templates/variables/docker-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2555712
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2566544
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
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/dotnet/build-test-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading