diff --git a/.github/ISSUE_TEMPLATE/releases/new-windows-release.md b/.github/ISSUE_TEMPLATE/releases/new-windows-release.md index 5c565988c..67ca5d2ab 100644 --- a/.github/ISSUE_TEMPLATE/releases/new-windows-release.md +++ b/.github/ISSUE_TEMPLATE/releases/new-windows-release.md @@ -7,7 +7,7 @@ Windows version: <version> 1. - [ ] Well before the Windows release date, contact DDFUN to schedule the provisioning of an Azure scale set for the new Windows version. 2. - [ ] If necessary, update [`PlatformInfo.cs`](https://github.com/dotnet/docker-tools/blob/main/src/ImageBuilder/ViewModel/PlatformInfo.cs) to generate the correct README display name from the version specified in the manifest. This is usually not needed unless Windows changes its naming scheme, since the code is version-independent. 3. - [ ] Add support for new Windows version in common pipeline templates: - - [ ] Add new default pool variables to [`variables/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/variables/common.yml#L48-L59) - - [ ] Add parameter for new windows default pool in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/stages/build-test-publish-repo.yml#L38-L39). - - [ ] Add new build and test jobs in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/stages/build-test-publish-repo.yml) to support the new Windows version. - - [ ] If necessary, add new .NET-specific pool/image variables to [`variables/dotnet/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/variables/dotnet/common.yml#L43-L48) and reference them from [`stages/dotnet/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/common/templates/stages/dotnet/build-test-publish-repo.yml#L115-L122) + - [ ] Add new default pool variables to [`variables/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/variables/common.yml#L48-L59) + - [ ] Add parameter for new windows default pool in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/stages/build-test-publish-repo.yml#L38-L39). + - [ ] Add new build and test jobs in [`stages/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/stages/build-test-publish-repo.yml) to support the new Windows version. + - [ ] If necessary, add new .NET-specific pool/image variables to [`variables/dotnet/common.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/variables/dotnet/common.yml#L43-L48) and reference them from [`stages/dotnet/build-test-publish-repo.yml`](https://github.com/dotnet/docker-tools/blob/3ba01b2b9abc1c28cd694cbddc11f5fdd8c70e8e/eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml#L115-L122) diff --git a/eng/common/templates/variables/common-paths.yml b/eng/common/templates/variables/common-paths.yml deleted file mode 100644 index 6e8864e4a..000000000 --- a/eng/common/templates/variables/common-paths.yml +++ /dev/null @@ -1,5 +0,0 @@ -variables: - engCommonRelativePath: eng/common - engCommonPath: $(Build.Repository.LocalPath)/$(engCommonRelativePath) - engPath: $(Build.Repository.LocalPath)/eng - testScriptPath: "" diff --git a/eng/eng-common-file-pusher-config.json b/eng/docker-tools-file-pusher-config.json similarity index 89% rename from eng/eng-common-file-pusher-config.json rename to eng/docker-tools-file-pusher-config.json index 599432b93..41863e164 100644 --- a/eng/eng-common-file-pusher-config.json +++ b/eng/docker-tools-file-pusher-config.json @@ -2,8 +2,8 @@ "commitMessage": "Update common Docker engineering infrastructure with latest", "pullRequestTitle": "Update common Docker engineering infrastructure with latest", "pullRequestDescription": "Updates the common Docker engineering infrastructure with latest changes from the dotnet/docker-tools repo.", - "sourcePath": "eng/common", - "workingBranchSuffix": "-update-eng-common", + "sourcePath": "eng/docker-tools", + "workingBranchSuffix": "-update-docker-tools", "repos": [ { "owner": "dotnet", diff --git a/eng/common/Dockerfile.WithRepo b/eng/docker-tools/Dockerfile.WithRepo similarity index 100% rename from eng/common/Dockerfile.WithRepo rename to eng/docker-tools/Dockerfile.WithRepo diff --git a/eng/common/Dockerfile.syft b/eng/docker-tools/Dockerfile.syft similarity index 100% rename from eng/common/Dockerfile.syft rename to eng/docker-tools/Dockerfile.syft diff --git a/eng/common/Get-BaseImageStatus.ps1 b/eng/docker-tools/Get-BaseImageStatus.ps1 similarity index 100% rename from eng/common/Get-BaseImageStatus.ps1 rename to eng/docker-tools/Get-BaseImageStatus.ps1 diff --git a/eng/common/Get-ImageBuilder.ps1 b/eng/docker-tools/Get-ImageBuilder.ps1 similarity index 100% rename from eng/common/Get-ImageBuilder.ps1 rename to eng/docker-tools/Get-ImageBuilder.ps1 diff --git a/eng/common/Get-ImageNameVars.ps1 b/eng/docker-tools/Get-ImageNameVars.ps1 similarity index 100% rename from eng/common/Get-ImageNameVars.ps1 rename to eng/docker-tools/Get-ImageNameVars.ps1 diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/docker-tools/Install-DotNetSdk.ps1 similarity index 100% rename from eng/common/Install-DotNetSdk.ps1 rename to eng/docker-tools/Install-DotNetSdk.ps1 diff --git a/eng/common/Invoke-CleanupDocker.ps1 b/eng/docker-tools/Invoke-CleanupDocker.ps1 similarity index 100% rename from eng/common/Invoke-CleanupDocker.ps1 rename to eng/docker-tools/Invoke-CleanupDocker.ps1 diff --git a/eng/common/Invoke-ImageBuilder.ps1 b/eng/docker-tools/Invoke-ImageBuilder.ps1 similarity index 93% rename from eng/common/Invoke-ImageBuilder.ps1 rename to eng/docker-tools/Invoke-ImageBuilder.ps1 index fb349557b..4cec5ba2b 100644 --- a/eng/common/Invoke-ImageBuilder.ps1 +++ b/eng/docker-tools/Invoke-ImageBuilder.ps1 @@ -64,9 +64,9 @@ try { # On Linux, ImageBuilder is run within a container. $imageBuilderImageName = "microsoft-dotnet-imagebuilder-withrepo" if ($ReuseImageBuilderImage -ne $True) { - & ./eng/common/Get-ImageBuilder.ps1 + & ./eng/docker-tools/Get-ImageBuilder.ps1 Exec ("docker build -t $imageBuilderImageName --build-arg " ` - + "IMAGE=${imageNames.imageBuilderName} -f eng/common/Dockerfile.WithRepo .") + + "IMAGE=${imageNames.imageBuilderName} -f eng/docker-tools/Dockerfile.WithRepo .") } $imageBuilderCmd = "docker run --name $imageBuilderContainerName -v /var/run/docker.sock:/var/run/docker.sock $imageBuilderImageName" @@ -78,7 +78,7 @@ try { $imageBuilderFolder = ".Microsoft.DotNet.ImageBuilder" $imageBuilderCmd = [System.IO.Path]::Combine($imageBuilderFolder, "Microsoft.DotNet.ImageBuilder.exe") if (-not (Test-Path -Path "$imageBuilderCmd" -PathType Leaf)) { - & ./eng/common/Get-ImageBuilder.ps1 + & ./eng/docker-tools/Get-ImageBuilder.ps1 Exec "docker create --name $imageBuilderContainerName ${imageNames.imageBuilderName}" $containerCreated = $true if (Test-Path -Path $imageBuilderFolder) diff --git a/eng/common/Invoke-WithRetry.ps1 b/eng/docker-tools/Invoke-WithRetry.ps1 similarity index 100% rename from eng/common/Invoke-WithRetry.ps1 rename to eng/docker-tools/Invoke-WithRetry.ps1 diff --git a/eng/common/Pull-Image.ps1 b/eng/docker-tools/Pull-Image.ps1 similarity index 100% rename from eng/common/Pull-Image.ps1 rename to eng/docker-tools/Pull-Image.ps1 diff --git a/eng/common/Retain-Build.ps1 b/eng/docker-tools/Retain-Build.ps1 similarity index 90% rename from eng/common/Retain-Build.ps1 rename to eng/docker-tools/Retain-Build.ps1 index ee601c950..7f836e121 100644 --- a/eng/common/Retain-Build.ps1 +++ b/eng/docker-tools/Retain-Build.ps1 @@ -1,7 +1,7 @@ -# Adapted from https://github.com/dotnet/arcade/blob/main/eng/common/retain-build.ps1 +# Adapted from https://github.com/dotnet/arcade/blob/main/eng/docker-tools/retain-build.ps1 Param( [Parameter(Mandatory = $true)][int] $BuildId, - [Parameter(Mandatory = $true)][string] $AzdoOrgUri, + [Parameter(Mandatory = $true)][string] $AzdoOrgUri, [Parameter(Mandatory = $true)][string] $AzdoProject, [Parameter(Mandatory = $true)][string] $Token ) diff --git a/eng/common/build.ps1 b/eng/docker-tools/build.ps1 similarity index 95% rename from eng/common/build.ps1 rename to eng/docker-tools/build.ps1 index 845c4e081..13c0806fb 100644 --- a/eng/common/build.ps1 +++ b/eng/docker-tools/build.ps1 @@ -69,7 +69,7 @@ try { $args += ' --manifest "{0}"' -f $Manifest } - ./eng/common/Invoke-ImageBuilder.ps1 "build $args" + ./eng/docker-tools/Invoke-ImageBuilder.ps1 "build $args" } finally { popd diff --git a/eng/common/readme.md b/eng/docker-tools/readme.md similarity index 100% rename from eng/common/readme.md rename to eng/docker-tools/readme.md diff --git a/eng/common/templates/1es-official.yml b/eng/docker-tools/templates/1es-official.yml similarity index 93% rename from eng/common/templates/1es-official.yml rename to eng/docker-tools/templates/1es-official.yml index 49721aa1c..ebf8fcd70 100644 --- a/eng/common/templates/1es-official.yml +++ b/eng/docker-tools/templates/1es-official.yml @@ -41,7 +41,7 @@ resources: ref: refs/tags/release extends: - template: /eng/common/templates/task-prefix-decorator.yml@self + template: /eng/docker-tools/templates/task-prefix-decorator.yml@self parameters: baseTemplate: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates templateParameters: @@ -63,7 +63,7 @@ extends: enabled: true stages: - ${{ if gt(length(parameters.serviceConnections), 0) }}: - - template: /eng/common/templates/stages/setup-service-connections.yml@self + - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self parameters: pool: ${{ parameters.pool }} serviceConnections: ${{ parameters.serviceConnections }} diff --git a/eng/common/templates/1es-unofficial.yml b/eng/docker-tools/templates/1es-unofficial.yml similarity index 94% rename from eng/common/templates/1es-unofficial.yml rename to eng/docker-tools/templates/1es-unofficial.yml index 541f92f29..bc584cd38 100644 --- a/eng/common/templates/1es-unofficial.yml +++ b/eng/docker-tools/templates/1es-unofficial.yml @@ -44,7 +44,7 @@ resources: ref: refs/tags/release extends: - template: /eng/common/templates/task-prefix-decorator.yml@self + template: /eng/docker-tools/templates/task-prefix-decorator.yml@self parameters: # Use a unique task prefix for unofficial pipelines taskPrefix: "🟦" @@ -72,7 +72,7 @@ extends: enabled: true stages: - ${{ if gt(length(parameters.serviceConnections), 0) }}: - - template: /eng/common/templates/stages/setup-service-connections.yml@self + - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self parameters: pool: ${{ parameters.pool }} serviceConnections: ${{ parameters.serviceConnections }} diff --git a/eng/common/templates/1es.yml b/eng/docker-tools/templates/1es.yml similarity index 97% rename from eng/common/templates/1es.yml rename to eng/docker-tools/templates/1es.yml index 95a44b2a1..5fde4a73d 100644 --- a/eng/common/templates/1es.yml +++ b/eng/docker-tools/templates/1es.yml @@ -48,7 +48,7 @@ resources: ref: refs/tags/release extends: - template: /eng/common/templates/task-prefix-decorator.yml@self + template: /eng/docker-tools/templates/task-prefix-decorator.yml@self parameters: baseTemplate: v1/1ES.${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'Official', 'Unofficial') }}.PipelineTemplate.yml@1ESPipelineTemplates templateParameters: diff --git a/eng/common/templates/jobs/build-images.yml b/eng/docker-tools/templates/jobs/build-images.yml similarity index 88% rename from eng/common/templates/jobs/build-images.yml rename to eng/docker-tools/templates/jobs/build-images.yml index 24fa3e795..1f7f9b566 100644 --- a/eng/common/templates/jobs/build-images.yml +++ b/eng/docker-tools/templates/jobs/build-images.yml @@ -30,11 +30,11 @@ jobs: imageInfoContainerDir: $(artifactsPath)/imageInfo steps: - ${{ parameters.commonInitStepsForMatrixAndBuild }} - - template: /eng/common/templates/jobs/${{ format('../steps/init-docker-{0}.yml', parameters.dockerClientOS) }}@self + - template: /eng/docker-tools/templates/jobs/${{ format('../steps/init-docker-{0}.yml', parameters.dockerClientOS) }}@self parameters: cleanupDocker: true - ${{ parameters.customInitSteps }} - - template: /eng/common/templates/steps/set-image-info-path-var.yml@self + - template: /eng/docker-tools/templates/steps/set-image-info-path-var.yml@self parameters: publicSourceBranch: $(publicSourceBranch) - powershell: echo "##vso[task.setvariable variable=imageBuilderBuildArgs]" @@ -62,7 +62,7 @@ jobs: echo "imageBuilderBuildArgs: $imageBuilderBuildArgs" echo "##vso[task.setvariable variable=imageBuilderBuildArgs]$imageBuilderBuildArgs" displayName: Set Image Builder Build Args - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: name: BuildImages displayName: Build Images @@ -93,7 +93,7 @@ jobs: --acr-resource-group '${{ parameters.publishConfig.buildAcr.resourceGroup }}' $(manifestVariables) $(imageBuilderBuildArgs) - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: path: $(imageInfoHostDir) artifactName: $(legName)-image-info-$(System.JobAttempt) @@ -105,23 +105,23 @@ jobs: $images = "$(BuildImages.builtImages)" if (-not $images) { return 0 } $syftImageName = "${{ parameters.publishConfig.publicMirrorAcr.server }}/$(imageNames.syft)" - & $(engCommonPath)/Pull-Image.ps1 $syftImageName + & $(engDockerToolsPath)/Pull-Image.ps1 $syftImageName $images -Split ',' | ForEach-Object { echo "Generating SBOM for $_"; $targetImageName = "$_"; $formattedImageName = $targetImageName.Replace('${{ parameters.publishConfig.buildAcr.server }}/${{ parameters.publishConfig.buildAcr.repoPrefix }}', "").Replace('/', '_').Replace(':', '_'); $sbomChildDir = "$(sbomDirectory)/$formattedImageName"; New-Item -Type Directory -Path $sbomChildDir > $null; - docker build --output=$sbomChildDir -f $(engCommonPath)/Dockerfile.syft --build-arg SYFT_IMAGE_NAME=$syftImageName --build-arg TARGET_IMAGE_NAME=$targetImageName -t syft-sbom $(engCommonPath); + docker build --output=$sbomChildDir -f $(engDockerToolsPath)/Dockerfile.syft --build-arg SYFT_IMAGE_NAME=$syftImageName --build-arg TARGET_IMAGE_NAME=$targetImageName -t syft-sbom $(engDockerToolsPath); } displayName: Generate SBOMs condition: and(succeeded(), ne(variables['BuildImages.builtImages'], '')) - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - template: /eng/common/templates/jobs/${{ format('../steps/test-images-{0}-client.yml', parameters.dockerClientOS) }}@self + - template: /eng/docker-tools/templates/jobs/${{ format('../steps/test-images-{0}-client.yml', parameters.dockerClientOS) }}@self parameters: condition: ne(variables.testScriptPath, '') - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.dockerClientOS, 'linux')) }}: - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: path: $(sbomDirectory) artifactName: $(legName)-sboms diff --git a/eng/common/templates/jobs/cg-build-projects.yml b/eng/docker-tools/templates/jobs/cg-build-projects.yml similarity index 95% rename from eng/common/templates/jobs/cg-build-projects.yml rename to eng/docker-tools/templates/jobs/cg-build-projects.yml index de372c4c4..845a6719c 100644 --- a/eng/common/templates/jobs/cg-build-projects.yml +++ b/eng/docker-tools/templates/jobs/cg-build-projects.yml @@ -22,7 +22,7 @@ jobs: os: linux steps: - powershell: > - ./eng/common/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "/usr/share/.dotnet" + ./eng/docker-tools/Install-DotNetSdk.ps1 -Channel ${{ parameters.dotnetVersionChannel }} -InstallPath "/usr/share/.dotnet" displayName: Run Dotnet Install Script - script: > find . -name '*.csproj' | grep $(cgBuildGrepArgs) | xargs -n 1 /usr/share/.dotnet/dotnet build diff --git a/eng/common/templates/jobs/copy-base-images-staging.yml b/eng/docker-tools/templates/jobs/copy-base-images-staging.yml similarity index 90% rename from eng/common/templates/jobs/copy-base-images-staging.yml rename to eng/docker-tools/templates/jobs/copy-base-images-staging.yml index 17f4d359c..20ce1f4da 100644 --- a/eng/common/templates/jobs/copy-base-images-staging.yml +++ b/eng/docker-tools/templates/jobs/copy-base-images-staging.yml @@ -19,7 +19,7 @@ parameters: default: false jobs: -- template: /eng/common/templates/jobs/copy-base-images.yml@self +- template: /eng/docker-tools/templates/jobs/copy-base-images.yml@self parameters: name: ${{ parameters.name }} pool: ${{ parameters.pool }} diff --git a/eng/common/templates/jobs/copy-base-images.yml b/eng/docker-tools/templates/jobs/copy-base-images.yml similarity index 84% rename from eng/common/templates/jobs/copy-base-images.yml rename to eng/docker-tools/templates/jobs/copy-base-images.yml index 3068a43cb..ffc5aee15 100644 --- a/eng/common/templates/jobs/copy-base-images.yml +++ b/eng/docker-tools/templates/jobs/copy-base-images.yml @@ -28,9 +28,9 @@ jobs: - job: ${{ parameters.name }} pool: ${{ parameters.pool }} steps: - - template: /eng/common/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self - ${{ parameters.customInitSteps }} - - template: /eng/common/templates/steps/copy-base-images.yml@self + - template: /eng/docker-tools/templates/steps/copy-base-images.yml@self parameters: acr: ${{ parameters.acr }} repoPrefix: ${{ parameters.repoPrefix }} diff --git a/eng/common/templates/jobs/generate-matrix.yml b/eng/docker-tools/templates/jobs/generate-matrix.yml similarity index 85% rename from eng/common/templates/jobs/generate-matrix.yml rename to eng/docker-tools/templates/jobs/generate-matrix.yml index 663aeb01f..606dec57f 100644 --- a/eng/common/templates/jobs/generate-matrix.yml +++ b/eng/docker-tools/templates/jobs/generate-matrix.yml @@ -16,18 +16,18 @@ jobs: pool: ${{ parameters.pool }} steps: - ${{ parameters.commonInitStepsForMatrixAndBuild }} - - template: /eng/common/templates/steps/retain-build.yml@self - - template: /eng/common/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/retain-build.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self - ${{ parameters.customInitSteps }} - - template: /eng/common/templates/steps/validate-branch.yml@self + - template: /eng/docker-tools/templates/steps/validate-branch.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} internalProjectName: ${{ parameters.internalProjectName }} - - template: /eng/common/templates/steps/set-image-info-path-var.yml + - template: /eng/docker-tools/templates/steps/set-image-info-path-var.yml parameters: publicSourceBranch: $(publicSourceBranch) - ${{ if eq(parameters.isTestStage, true) }}: - - template: /eng/common/templates/steps/download-build-artifact.yml@self + - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self parameters: targetPath: $(Build.ArtifactStagingDirectory) artifactName: image-info @@ -59,7 +59,7 @@ jobs: $(commonMatrixAndBuildOptions) $(additionalGenerateBuildMatrixOptions)" displayName: Set GenerateBuildMatrix Command - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: name: matrix displayName: Generate ${{ parameters.matrixType }} Matrix diff --git a/eng/common/templates/jobs/post-build.yml b/eng/docker-tools/templates/jobs/post-build.yml similarity index 92% rename from eng/common/templates/jobs/post-build.yml rename to eng/docker-tools/templates/jobs/post-build.yml index 31ad2eff0..33b91ec03 100644 --- a/eng/common/templates/jobs/post-build.yml +++ b/eng/docker-tools/templates/jobs/post-build.yml @@ -13,8 +13,8 @@ jobs: imageInfosOutputSubDir: "/output" sbomOutputDir: "$(Build.ArtifactStagingDirectory)/sbom" steps: - - template: /eng/common/templates/steps/init-docker-linux.yml@self - - template: /eng/common/templates/steps/download-build-artifact.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self parameters: targetPath: $(Build.ArtifactStagingDirectory) # This can fail if no build jobs ran to produce any artifacts @@ -69,7 +69,7 @@ jobs: $(manifestVariables) name: MergeImageInfoFiles displayName: Merge Image Info Files - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: condition: and(succeeded(), ne(variables['MergeImageInfoFiles.noImageInfos'], 'true')) path: $(sbomOutputDir) @@ -77,7 +77,7 @@ jobs: displayName: Publish SBOM Artifact internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: condition: and(succeeded(), ne(variables['MergeImageInfoFiles.noImageInfos'], 'true')) path: $(imageInfosHostDir)$(imageInfosOutputSubDir) diff --git a/eng/common/templates/jobs/publish.yml b/eng/docker-tools/templates/jobs/publish.yml similarity index 88% rename from eng/common/templates/jobs/publish.yml rename to eng/docker-tools/templates/jobs/publish.yml index 463d9af45..cb9b454ac 100644 --- a/eng/common/templates/jobs/publish.yml +++ b/eng/docker-tools/templates/jobs/publish.yml @@ -45,14 +45,14 @@ jobs: - ${{ parameters.customPublishVariables }} steps: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} - - template: /eng/common/templates/steps/retain-build.yml@self + - template: /eng/docker-tools/templates/steps/retain-build.yml@self - - template: /eng/common/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self - pwsh: | $azdoOrgName = Split-Path -Leaf $Env:SYSTEM_COLLECTIONURI @@ -63,11 +63,11 @@ jobs: - ${{ parameters.customInitSteps }} - - template: /eng/common/templates/steps/validate-branch.yml@self + - template: /eng/docker-tools/templates/steps/validate-branch.yml@self parameters: internalProjectName: ${{ parameters.internalProjectName }} - - template: /eng/common/templates/steps/download-build-artifact.yml@self + - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self parameters: targetPath: $(imageInfoHostDir) artifactName: image-info @@ -76,11 +76,11 @@ jobs: # This can fail in scenarios where no build jobs have run to produce any artifacts continueOnError: true - - template: /eng/common/templates/steps/set-image-info-path-var.yml@self + - template: /eng/docker-tools/templates/steps/set-image-info-path-var.yml@self parameters: publicSourceBranch: $(publicSourceBranch) - - template: /eng/common/templates/steps/set-dry-run.yml@self + - template: /eng/docker-tools/templates/steps/set-dry-run.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} @@ -92,7 +92,7 @@ jobs: '$(imageInfoContainerDir)/image-info.json' displayName: Trim Unchanged Images - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Copy Images serviceConnections: @@ -115,7 +115,7 @@ jobs: $(imageBuilder.pathArgs) $(imageBuilder.commonCmdArgs) - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Publish Manifest serviceConnections: @@ -135,7 +135,7 @@ jobs: $(imageBuilder.pathArgs) $(imageBuilder.commonCmdArgs) - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: path: $(imageInfoHostDir) artifactName: image-info-final-$(System.JobAttempt) @@ -143,7 +143,7 @@ jobs: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} - - template: /eng/common/templates/steps/wait-for-mcr-image-ingestion.yml@self + - template: /eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} imageInfoPath: '$(imageinfoContainerDir)/image-info.json' @@ -151,7 +151,7 @@ jobs: dryRunArg: $(dryRunArg) condition: succeeded() - - template: /eng/common/templates/steps/publish-readmes.yml@self + - template: /eng/docker-tools/templates/steps/publish-readmes.yml@self parameters: dryRunArg: $(dryRunArg) condition: and(succeeded(), eq(variables['publishReadme'], 'true')) @@ -183,7 +183,7 @@ jobs: condition: and(succeeded(), eq(variables['publishImageInfo'], 'true')) displayName: Merge Image Info - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Ingest Kusto Image Info serviceConnections: @@ -205,7 +205,7 @@ jobs: $(dryRunArg) $(imageBuilder.commonCmdArgs) - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Generate EOL Annotation Data serviceConnections: @@ -225,7 +225,7 @@ jobs: $(generateEolAnnotationDataExtraOptions) $(dryRunArg) - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: path: $(Build.ArtifactStagingDirectory)/eol-annotation-data artifactName: eol-annotation-data-$(System.JobAttempt) @@ -234,7 +234,7 @@ jobs: publicProjectName: public condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true')) - - template: /eng/common/templates/steps/annotate-eol-digests.yml@self + - template: /eng/docker-tools/templates/steps/annotate-eol-digests.yml@self parameters: acr: ${{ parameters.publishConfig.publishAcr }} dataFile: $(artifactsPath)/eol-annotation-data/eol-annotation-data.json @@ -255,10 +255,10 @@ jobs: displayName: Publish Image Info # Task displayNames names are hardcoded to reference the task prefix used by 1ES official - # pipelines in eng/common/templates/1es-official.yml. + # pipelines in eng/docker-tools/templates/1es-official.yml. # # These will fail if they are dependend on by an unofficial pipeline since they use a unique task - # prefix compared to official pipelines (see eng/common/templates/1es-unofficial.yml). This is + # prefix compared to official pipelines (see eng/docker-tools/templates/1es-unofficial.yml). This is # acceptable because unofficial pipelines should not publish images. # # https://github.com/dotnet/docker-tools/issues/1698 tracks making this command no longer depend @@ -303,7 +303,7 @@ jobs: condition: succeeded() displayName: Write Source Build ID to File - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: path: $(sourceBuildIdOutputDir) artifactName: source-build-id diff --git a/eng/common/templates/jobs/test-images-linux-client.yml b/eng/docker-tools/templates/jobs/test-images-linux-client.yml similarity index 92% rename from eng/common/templates/jobs/test-images-linux-client.yml rename to eng/docker-tools/templates/jobs/test-images-linux-client.yml index 9aa30e659..44e9e2fb7 100644 --- a/eng/common/templates/jobs/test-images-linux-client.yml +++ b/eng/docker-tools/templates/jobs/test-images-linux-client.yml @@ -21,7 +21,7 @@ jobs: pool: ${{ parameters.pool }} timeoutInMinutes: ${{ parameters.testJobTimeout }} steps: - - template: /eng/common/templates/steps/test-images-linux-client.yml@self + - template: /eng/docker-tools/templates/steps/test-images-linux-client.yml@self parameters: preBuildValidation: ${{ parameters.preBuildValidation }} internalProjectName: ${{ parameters.internalProjectName }} diff --git a/eng/common/templates/jobs/test-images-windows-client.yml b/eng/docker-tools/templates/jobs/test-images-windows-client.yml similarity index 89% rename from eng/common/templates/jobs/test-images-windows-client.yml rename to eng/docker-tools/templates/jobs/test-images-windows-client.yml index 94965f4cf..390f01da6 100644 --- a/eng/common/templates/jobs/test-images-windows-client.yml +++ b/eng/docker-tools/templates/jobs/test-images-windows-client.yml @@ -17,7 +17,7 @@ jobs: matrix: $[ ${{ parameters.matrix }} ] timeoutInMinutes: ${{ parameters.testJobTimeout }} steps: - - template: /eng/common/templates/steps/test-images-windows-client.yml@self + - template: /eng/docker-tools/templates/steps/test-images-windows-client.yml@self parameters: internalProjectName: ${{ parameters.internalProjectName }} publishConfig: ${{ parameters.publishConfig }} diff --git a/eng/common/templates/stages/build-and-test.yml b/eng/docker-tools/templates/stages/build-and-test.yml similarity index 86% rename from eng/common/templates/stages/build-and-test.yml rename to eng/docker-tools/templates/stages/build-and-test.yml index 2d5ed7026..b9df61a4c 100644 --- a/eng/common/templates/stages/build-and-test.yml +++ b/eng/docker-tools/templates/stages/build-and-test.yml @@ -52,7 +52,7 @@ stages: dependsOn: [] jobs: - - template: /eng/common/templates/jobs/test-images-linux-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-linux-client.yml@self parameters: name: PreBuildValidation pool: ${{ parameters.linuxAmd64Pool }} @@ -72,7 +72,7 @@ stages: echo "##vso[task.setvariable variable=architecture]" displayName: Initialize Test Variables - - template: /eng/common/templates/jobs/copy-base-images-staging.yml@self + - template: /eng/docker-tools/templates/jobs/copy-base-images-staging.yml@self parameters: name: CopyBaseImages publishConfig: ${{ parameters.publishConfig }} @@ -80,7 +80,7 @@ stages: additionalOptions: "--manifest '$(manifest)' $(imageBuilder.pathArgs) $(manifestVariables)" customInitSteps: ${{ parameters.customCopyBaseImagesInitSteps }} - - template: /eng/common/templates/jobs/generate-matrix.yml@self + - template: /eng/docker-tools/templates/jobs/generate-matrix.yml@self parameters: matrixType: ${{ parameters.buildMatrixType }} name: GenerateBuildMatrix @@ -91,12 +91,12 @@ stages: publishConfig: ${{ parameters.publishConfig }} customInitSteps: ${{ parameters.customGenerateMatrixInitSteps }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} - - template: /eng/common/templates/jobs/build-images.yml@self + - template: /eng/docker-tools/templates/jobs/build-images.yml@self parameters: name: Linux_amd64 pool: ${{ parameters.linuxAmd64Pool }} @@ -104,7 +104,7 @@ stages: dockerClientOS: linux buildJobTimeout: ${{ parameters.linuxAmdBuildJobTimeout }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} @@ -114,7 +114,7 @@ stages: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} storageAccountServiceConnection: ${{ parameters.storageAccountServiceConnection }} - - template: /eng/common/templates/jobs/build-images.yml@self + - template: /eng/docker-tools/templates/jobs/build-images.yml@self parameters: name: Linux_arm64 pool: ${{ parameters.linuxArm64Pool }} @@ -122,7 +122,7 @@ stages: dockerClientOS: linux buildJobTimeout: ${{ parameters.linuxArmBuildJobTimeout }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} @@ -132,7 +132,7 @@ stages: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} storageAccountServiceConnection: ${{ parameters.storageAccountServiceConnection }} - - template: /eng/common/templates/jobs/build-images.yml@self + - template: /eng/docker-tools/templates/jobs/build-images.yml@self parameters: name: Linux_arm32 pool: ${{ parameters.linuxArm32Pool }} @@ -140,7 +140,7 @@ stages: dockerClientOS: linux buildJobTimeout: ${{ parameters.linuxArmBuildJobTimeout }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} @@ -150,7 +150,7 @@ stages: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} storageAccountServiceConnection: ${{ parameters.storageAccountServiceConnection }} - - template: /eng/common/templates/jobs/build-images.yml@self + - template: /eng/docker-tools/templates/jobs/build-images.yml@self parameters: name: Windows1809_amd64 pool: ${{ parameters.windows1809Pool }} @@ -158,7 +158,7 @@ stages: dockerClientOS: windows buildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} @@ -168,7 +168,7 @@ stages: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} storageAccountServiceConnection: ${{ parameters.storageAccountServiceConnection }} - - template: /eng/common/templates/jobs/build-images.yml@self + - template: /eng/docker-tools/templates/jobs/build-images.yml@self parameters: name: Windows2022_amd64 pool: ${{ parameters.windows2022Pool }} @@ -176,7 +176,7 @@ stages: dockerClientOS: windows buildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} @@ -186,7 +186,7 @@ stages: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} storageAccountServiceConnection: ${{ parameters.storageAccountServiceConnection }} - - template: /eng/common/templates/jobs/build-images.yml@self + - template: /eng/docker-tools/templates/jobs/build-images.yml@self parameters: name: Windows2025_amd64 pool: ${{ parameters.windows2025Pool }} @@ -194,7 +194,7 @@ stages: dockerClientOS: windows buildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} @@ -205,7 +205,7 @@ stages: publicProjectName: ${{ parameters.publicProjectName }} versionsRepoRef: ${{ parameters.versionsRepoRef }} storageAccountServiceConnection: ${{ parameters.storageAccountServiceConnection }} - - template: /eng/common/templates/jobs/build-images.yml@self + - template: /eng/docker-tools/templates/jobs/build-images.yml@self parameters: name: WindowsLtsc2016_amd64 pool: ${{ parameters.windows2016Pool }} @@ -213,7 +213,7 @@ stages: dockerClientOS: windows buildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} versionsRepoRef: ${{ parameters.versionsRepoRef }} @@ -231,7 +231,7 @@ stages: dependsOn: Build condition: and(succeeded(), contains(variables['stages'], 'build')) jobs: - - template: /eng/common/templates/jobs/post-build.yml@self + - template: /eng/docker-tools/templates/jobs/post-build.yml@self parameters: pool: ${{ parameters.linuxAmd64Pool }} internalProjectName: ${{ parameters.internalProjectName }} @@ -255,7 +255,7 @@ stages: contains(variables['stages'], 'build')), not(contains(variables['stages'], 'build')))))" jobs: - - template: /eng/common/templates/jobs/generate-matrix.yml@self + - template: /eng/docker-tools/templates/jobs/generate-matrix.yml@self parameters: matrixType: ${{ parameters.testMatrixType }} name: GenerateTestMatrix @@ -267,11 +267,11 @@ stages: customInitSteps: ${{ parameters.customGenerateMatrixInitSteps }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} commonInitStepsForMatrixAndBuild: - - template: /eng/common/templates/steps/init-matrix-build-publish.yml@self + - template: /eng/docker-tools/templates/steps/init-matrix-build-publish.yml@self parameters: versionsRepoRef: ${{ parameters.versionsRepoRef }} publishConfig: ${{ parameters.publishConfig }} - - template: /eng/common/templates/jobs/test-images-linux-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-linux-client.yml@self parameters: name: Linux_amd64 pool: ${{ parameters.linuxAmd64Pool }} @@ -281,7 +281,7 @@ stages: publishConfig: ${{ parameters.publishConfig }} customInitSteps: ${{ parameters.customTestInitSteps }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} - - template: /eng/common/templates/jobs/test-images-linux-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-linux-client.yml@self parameters: name: Linux_arm64 pool: ${{ parameters.linuxArm64Pool }} @@ -291,7 +291,7 @@ stages: publishConfig: ${{ parameters.publishConfig }} customInitSteps: ${{ parameters.customTestInitSteps }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} - - template: /eng/common/templates/jobs/test-images-linux-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-linux-client.yml@self parameters: name: Linux_arm32 pool: ${{ parameters.linuxArm32Pool }} @@ -301,7 +301,7 @@ stages: publishConfig: ${{ parameters.publishConfig }} customInitSteps: ${{ parameters.customTestInitSteps }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} - - template: /eng/common/templates/jobs/test-images-windows-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-windows-client.yml@self parameters: name: Windows1809_amd64 pool: ${{ parameters.windows1809Pool }} @@ -311,7 +311,7 @@ stages: publishConfig: ${{ parameters.publishConfig }} customInitSteps: ${{ parameters.customTestInitSteps }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} - - template: /eng/common/templates/jobs/test-images-windows-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-windows-client.yml@self parameters: name: Windows2022_amd64 pool: ${{ parameters.windows2022Pool }} @@ -321,7 +321,7 @@ stages: publishConfig: ${{ parameters.publishConfig }} customInitSteps: ${{ parameters.customTestInitSteps }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} - - template: /eng/common/templates/jobs/test-images-windows-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-windows-client.yml@self parameters: name: Windows2025_amd64 pool: ${{ parameters.windows2025Pool }} @@ -331,7 +331,7 @@ stages: publishConfig: ${{ parameters.publishConfig }} customInitSteps: ${{ parameters.customTestInitSteps }} sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} - - template: /eng/common/templates/jobs/test-images-windows-client.yml@self + - template: /eng/docker-tools/templates/jobs/test-images-windows-client.yml@self parameters: name: WindowsLtsc2016_amd64 pool: ${{ parameters.windows2016Pool }} diff --git a/eng/common/templates/stages/dotnet/build-and-test.yml b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml similarity index 98% rename from eng/common/templates/stages/dotnet/build-and-test.yml rename to eng/docker-tools/templates/stages/dotnet/build-and-test.yml index dd8afd9ec..311b16133 100644 --- a/eng/common/templates/stages/dotnet/build-and-test.yml +++ b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml @@ -40,7 +40,7 @@ parameters: versionsRepoRef: null stages: -- template: /eng/common/templates/stages/build-and-test.yml@self +- template: /eng/docker-tools/templates/stages/build-and-test.yml@self parameters: noCache: ${{ parameters.noCache }} publishConfig: ${{ parameters.publishConfig }} diff --git a/eng/common/templates/stages/dotnet/build-test-publish-repo.yml b/eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml similarity index 94% rename from eng/common/templates/stages/dotnet/build-test-publish-repo.yml rename to eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml index ee8f43af7..c412f00d2 100644 --- a/eng/common/templates/stages/dotnet/build-test-publish-repo.yml +++ b/eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml @@ -35,7 +35,7 @@ parameters: versionsRepoRef: "" stages: -- template: /eng/common/templates/stages/dotnet/build-and-test.yml@self +- template: /eng/docker-tools/templates/stages/dotnet/build-and-test.yml@self parameters: linuxAmd64Pool: ${{ parameters.linuxAmd64Pool }} # Pre-build @@ -63,7 +63,7 @@ stages: publicProjectName: ${{ parameters.publicProjectName }} versionsRepoRef: ${{ parameters.versionsRepoRef }} -- template: /eng/common/templates/stages/dotnet/publish.yml@self +- template: /eng/docker-tools/templates/stages/dotnet/publish.yml@self parameters: pool: ${{ parameters.linuxAmd64Pool }} customPublishInitSteps: ${{ parameters.customPublishInitSteps }} diff --git a/eng/common/templates/stages/dotnet/publish-config-nonprod.yml b/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml similarity index 100% rename from eng/common/templates/stages/dotnet/publish-config-nonprod.yml rename to eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml diff --git a/eng/common/templates/stages/dotnet/publish-config-prod.yml b/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml similarity index 100% rename from eng/common/templates/stages/dotnet/publish-config-prod.yml rename to eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml diff --git a/eng/common/templates/stages/dotnet/publish.yml b/eng/docker-tools/templates/stages/dotnet/publish.yml similarity index 97% rename from eng/common/templates/stages/dotnet/publish.yml rename to eng/docker-tools/templates/stages/dotnet/publish.yml index d041b3d54..66cb2c8bd 100644 --- a/eng/common/templates/stages/dotnet/publish.yml +++ b/eng/docker-tools/templates/stages/dotnet/publish.yml @@ -14,7 +14,7 @@ parameters: overrideImageInfoCommit: false stages: -- template: /eng/common/templates/stages/publish.yml@self +- template: /eng/docker-tools/templates/stages/publish.yml@self parameters: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} diff --git a/eng/common/templates/stages/publish.yml b/eng/docker-tools/templates/stages/publish.yml similarity index 97% rename from eng/common/templates/stages/publish.yml rename to eng/docker-tools/templates/stages/publish.yml index f1569fbac..ffdd594c2 100644 --- a/eng/common/templates/stages/publish.yml +++ b/eng/docker-tools/templates/stages/publish.yml @@ -66,7 +66,7 @@ stages: contains(variables['stages'], 'build'), contains(variables['stages'], 'test'))))))" jobs: - - template: /eng/common/templates/jobs/publish.yml@self + - template: /eng/docker-tools/templates/jobs/publish.yml@self parameters: pool: ${{ parameters.pool }} internalProjectName: ${{ parameters.internalProjectName }} diff --git a/eng/common/templates/stages/setup-service-connections.yml b/eng/docker-tools/templates/stages/setup-service-connections.yml similarity index 100% rename from eng/common/templates/stages/setup-service-connections.yml rename to eng/docker-tools/templates/stages/setup-service-connections.yml diff --git a/eng/common/templates/steps/annotate-eol-digests.yml b/eng/docker-tools/templates/steps/annotate-eol-digests.yml similarity index 89% rename from eng/common/templates/steps/annotate-eol-digests.yml rename to eng/docker-tools/templates/steps/annotate-eol-digests.yml index 57c5221fc..0cb090c1c 100644 --- a/eng/common/templates/steps/annotate-eol-digests.yml +++ b/eng/docker-tools/templates/steps/annotate-eol-digests.yml @@ -8,7 +8,7 @@ parameters: steps: - script: mkdir -p $(Build.ArtifactStagingDirectory)/annotation-digests displayName: Create Annotation Digests Directory - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Annotate EOL Images (${{ parameters.acr.server }}) serviceConnections: @@ -25,7 +25,7 @@ steps: "${{ parameters.acr.repoPrefix }}" $(artifactsPath)/annotation-digests/annotation-digests.txt $(dryRunArg) - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: path: $(Build.ArtifactStagingDirectory)/annotation-digests artifactName: annotation-digests-${{ parameters.acr.server }}-$(System.JobAttempt) @@ -33,7 +33,7 @@ steps: internalProjectName: internal publicProjectName: public condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true')) - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Wait for Annotation Ingestion (${{ parameters.acr.server }}) serviceConnections: diff --git a/eng/common/templates/steps/clean-acr-images.yml b/eng/docker-tools/templates/steps/clean-acr-images.yml similarity index 94% rename from eng/common/templates/steps/clean-acr-images.yml rename to eng/docker-tools/templates/steps/clean-acr-images.yml index 0361df442..b791de305 100644 --- a/eng/common/templates/steps/clean-acr-images.yml +++ b/eng/docker-tools/templates/steps/clean-acr-images.yml @@ -7,7 +7,7 @@ parameters: internalProjectName: null publishConfig: null steps: - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: # Options are documented in CleanAcrImagesOptions.cs ${{ if eq(parameters.action, 'delete') }}: diff --git a/eng/common/templates/steps/cleanup-docker-linux.yml b/eng/docker-tools/templates/steps/cleanup-docker-linux.yml similarity index 100% rename from eng/common/templates/steps/cleanup-docker-linux.yml rename to eng/docker-tools/templates/steps/cleanup-docker-linux.yml diff --git a/eng/common/templates/steps/cleanup-docker-windows.yml b/eng/docker-tools/templates/steps/cleanup-docker-windows.yml similarity index 91% rename from eng/common/templates/steps/cleanup-docker-windows.yml rename to eng/docker-tools/templates/steps/cleanup-docker-windows.yml index 98fc52969..a2c41c20b 100644 --- a/eng/common/templates/steps/cleanup-docker-windows.yml +++ b/eng/docker-tools/templates/steps/cleanup-docker-windows.yml @@ -1,11 +1,11 @@ parameters: condition: true - + steps: ################################################################################ # Cleanup Docker Resources ################################################################################ -- powershell: $(engCommonPath)/Invoke-CleanupDocker.ps1 +- powershell: $(engDockerToolsPath)/Invoke-CleanupDocker.ps1 displayName: Cleanup Docker Images condition: and(always(), ${{ parameters.condition }}) continueOnError: true diff --git a/eng/common/templates/steps/copy-base-images.yml b/eng/docker-tools/templates/steps/copy-base-images.yml similarity index 95% rename from eng/common/templates/steps/copy-base-images.yml rename to eng/docker-tools/templates/steps/copy-base-images.yml index f78b1c5dc..d54737083 100644 --- a/eng/common/templates/steps/copy-base-images.yml +++ b/eng/docker-tools/templates/steps/copy-base-images.yml @@ -25,7 +25,7 @@ parameters: steps: - ${{ if or(eq(parameters.forceDryRun, true), eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: - script: echo "##vso[task.setvariable variable=dryRunArg]--dry-run" -- template: /eng/common/templates/steps/run-imagebuilder.yml@self +- template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Copy Base Images serviceConnections: diff --git a/eng/common/templates/steps/download-build-artifact.yml b/eng/docker-tools/templates/steps/download-build-artifact.yml similarity index 100% rename from eng/common/templates/steps/download-build-artifact.yml rename to eng/docker-tools/templates/steps/download-build-artifact.yml diff --git a/eng/common/templates/steps/init-common.yml b/eng/docker-tools/templates/steps/init-common.yml similarity index 100% rename from eng/common/templates/steps/init-common.yml rename to eng/docker-tools/templates/steps/init-common.yml diff --git a/eng/common/templates/steps/init-docker-linux.yml b/eng/docker-tools/templates/steps/init-docker-linux.yml similarity index 88% rename from eng/common/templates/steps/init-docker-linux.yml rename to eng/docker-tools/templates/steps/init-docker-linux.yml index 8c554ad9b..c8669e19b 100644 --- a/eng/common/templates/steps/init-docker-linux.yml +++ b/eng/docker-tools/templates/steps/init-docker-linux.yml @@ -5,7 +5,7 @@ parameters: condition: true steps: -- template: /eng/common/templates/steps/init-common.yml@self +- template: /eng/docker-tools/templates/steps/init-common.yml@self parameters: condition: ${{ parameters.condition }} - script: echo "##vso[task.setvariable variable=artifactsPath]/artifacts" @@ -16,7 +16,7 @@ steps: # Cleanup Docker Resources ################################################################################ - ${{ if eq(parameters.cleanupDocker, 'true') }}: - - template: /eng/common/templates/steps/cleanup-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/cleanup-docker-linux.yml@self parameters: condition: ${{ parameters.condition }} @@ -25,7 +25,7 @@ steps: ################################################################################ - ${{ if eq(parameters.setupImageBuilder, 'true') }}: - - powershell: $(engCommonPath)/Pull-Image.ps1 $(imageNames.imageBuilder) + - powershell: $(engDockerToolsPath)/Pull-Image.ps1 $(imageNames.imageBuilder) displayName: Pull Image Builder condition: and(succeeded(), ${{ parameters.condition }}) @@ -33,7 +33,7 @@ steps: docker build -t $(imageNames.imageBuilder.withrepo) --build-arg IMAGE=$(imageNames.imageBuilder) - -f $(engCommonPath)/Dockerfile.WithRepo . + -f $(engDockerToolsPath)/Dockerfile.WithRepo . displayName: Build Image for Image Builder condition: and(succeeded(), ${{ parameters.condition }}) @@ -78,13 +78,13 @@ steps: # Setup Test Runner (Optional) ################################################################################ - ${{ if eq(parameters.setupTestRunner, 'true') }}: - - powershell: $(engCommonPath)/Pull-Image.ps1 $(imageNames.testrunner) + - powershell: $(engDockerToolsPath)/Pull-Image.ps1 $(imageNames.testrunner) displayName: Pull Test Runner condition: and(succeeded(), ${{ parameters.condition }}) - script: > docker build -t $(imageNames.testRunner.withrepo) --build-arg IMAGE=$(imageNames.testrunner) - -f $(engCommonPath)/Dockerfile.WithRepo . + -f $(engDockerToolsPath)/Dockerfile.WithRepo . displayName: Build Test Runner Image condition: and(succeeded(), ${{ parameters.condition }}) diff --git a/eng/common/templates/steps/init-docker-windows.yml b/eng/docker-tools/templates/steps/init-docker-windows.yml similarity index 89% rename from eng/common/templates/steps/init-docker-windows.yml rename to eng/docker-tools/templates/steps/init-docker-windows.yml index ae867f9e8..e8593b5eb 100644 --- a/eng/common/templates/steps/init-docker-windows.yml +++ b/eng/docker-tools/templates/steps/init-docker-windows.yml @@ -3,7 +3,7 @@ parameters: condition: true steps: -- template: /eng/common/templates/steps/init-common.yml@self +- template: /eng/docker-tools/templates/steps/init-common.yml@self parameters: condition: ${{ parameters.condition }} - powershell: echo "##vso[task.setvariable variable=artifactsPath]$(Build.ArtifactStagingDirectory)" @@ -13,7 +13,7 @@ steps: ################################################################################ # Cleanup Docker Resources ################################################################################ -- template: /eng/common/templates/steps/cleanup-docker-windows.yml@self +- template: /eng/docker-tools/templates/steps/cleanup-docker-windows.yml@self parameters: condition: ${{ parameters.condition }} @@ -21,7 +21,7 @@ steps: # Setup Image Builder (Optional) ################################################################################ - ${{ if eq(parameters.setupImageBuilder, 'true') }}: - - powershell: $(engCommonPath)/Invoke-WithRetry.ps1 "docker pull $(imageNames.imageBuilder)" + - powershell: $(engDockerToolsPath)/Invoke-WithRetry.ps1 "docker pull $(imageNames.imageBuilder)" displayName: Pull Image Builder condition: and(succeeded(), ${{ parameters.condition }}) - script: docker create --name setupImageBuilder-$(Build.BuildId)-$(System.JobId) $(imageNames.imageBuilder) diff --git a/eng/common/templates/steps/init-matrix-build-publish.yml b/eng/docker-tools/templates/steps/init-matrix-build-publish.yml similarity index 94% rename from eng/common/templates/steps/init-matrix-build-publish.yml rename to eng/docker-tools/templates/steps/init-matrix-build-publish.yml index 5ba018fee..8a555eccd 100644 --- a/eng/common/templates/steps/init-matrix-build-publish.yml +++ b/eng/docker-tools/templates/steps/init-matrix-build-publish.yml @@ -39,7 +39,7 @@ steps: $buildRepoName = "$(Build.Repository.Name)" } - $engCommonPath = "$(Build.Repository.LocalPath)/$buildRepoName/$(engCommonRelativePath)" + $engDockerToolsPath = "$(Build.Repository.LocalPath)/$buildRepoName/$(engDockerToolsRelativePath)" $engPath = "$(Build.Repository.LocalPath)/$buildRepoName/eng" $manifest = "$buildRepoName/$(manifest)" @@ -50,7 +50,7 @@ steps: } echo "##vso[task.setvariable variable=buildRepoName]$buildRepoName" - echo "##vso[task.setvariable variable=engCommonPath]$engCommonPath" + echo "##vso[task.setvariable variable=engDockerToolsPath]$engDockerToolsPath" echo "##vso[task.setvariable variable=manifest]$manifest" echo "##vso[task.setvariable variable=engPath]$engPath" echo "##vso[task.setvariable variable=testScriptPath]$testScriptPath" diff --git a/eng/common/templates/steps/parse-test-arg-arrays.yml b/eng/docker-tools/templates/steps/parse-test-arg-arrays.yml similarity index 100% rename from eng/common/templates/steps/parse-test-arg-arrays.yml rename to eng/docker-tools/templates/steps/parse-test-arg-arrays.yml diff --git a/eng/common/templates/steps/publish-artifact.yml b/eng/docker-tools/templates/steps/publish-artifact.yml similarity index 100% rename from eng/common/templates/steps/publish-artifact.yml rename to eng/docker-tools/templates/steps/publish-artifact.yml diff --git a/eng/common/templates/steps/publish-readmes.yml b/eng/docker-tools/templates/steps/publish-readmes.yml similarity index 91% rename from eng/common/templates/steps/publish-readmes.yml rename to eng/docker-tools/templates/steps/publish-readmes.yml index 4cf80ecf7..270898050 100644 --- a/eng/common/templates/steps/publish-readmes.yml +++ b/eng/docker-tools/templates/steps/publish-readmes.yml @@ -22,7 +22,7 @@ steps: name: PublishReadmes displayName: Publish Readmes condition: ${{ parameters.condition }} -- template: /eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml@self +- template: /eng/docker-tools/templates/steps/wait-for-mcr-doc-ingestion.yml@self parameters: commitDigest: $(PublishReadmes.readmeCommitDigest) condition: and(${{ parameters.condition }}, ne(variables['PublishReadmes.readmeCommitDigest'], '')) diff --git a/eng/common/templates/steps/retain-build.yml b/eng/docker-tools/templates/steps/retain-build.yml similarity index 86% rename from eng/common/templates/steps/retain-build.yml rename to eng/docker-tools/templates/steps/retain-build.yml index 0cb192c68..bcf11d57e 100644 --- a/eng/common/templates/steps/retain-build.yml +++ b/eng/docker-tools/templates/steps/retain-build.yml @@ -1,6 +1,6 @@ steps: - powershell: > - $(engCommonPath)/Retain-Build.ps1 + $(engDockerToolsPath)/Retain-Build.ps1 -BuildId $(Build.BuildId) -AzdoOrgUri '$(System.CollectionUri)' -AzdoProject '$(System.TeamProject)' diff --git a/eng/common/templates/steps/run-imagebuilder.yml b/eng/docker-tools/templates/steps/run-imagebuilder.yml similarity index 100% rename from eng/common/templates/steps/run-imagebuilder.yml rename to eng/docker-tools/templates/steps/run-imagebuilder.yml diff --git a/eng/common/templates/steps/run-pwsh-with-auth.yml b/eng/docker-tools/templates/steps/run-pwsh-with-auth.yml similarity index 100% rename from eng/common/templates/steps/run-pwsh-with-auth.yml rename to eng/docker-tools/templates/steps/run-pwsh-with-auth.yml diff --git a/eng/common/templates/steps/set-dry-run.yml b/eng/docker-tools/templates/steps/set-dry-run.yml similarity index 100% rename from eng/common/templates/steps/set-dry-run.yml rename to eng/docker-tools/templates/steps/set-dry-run.yml diff --git a/eng/common/templates/steps/set-image-info-path-var.yml b/eng/docker-tools/templates/steps/set-image-info-path-var.yml similarity index 100% rename from eng/common/templates/steps/set-image-info-path-var.yml rename to eng/docker-tools/templates/steps/set-image-info-path-var.yml diff --git a/eng/common/templates/steps/test-images-linux-client.yml b/eng/docker-tools/templates/steps/test-images-linux-client.yml similarity index 92% rename from eng/common/templates/steps/test-images-linux-client.yml rename to eng/docker-tools/templates/steps/test-images-linux-client.yml index e97f015c7..38426ab2a 100644 --- a/eng/common/templates/steps/test-images-linux-client.yml +++ b/eng/docker-tools/templates/steps/test-images-linux-client.yml @@ -7,7 +7,7 @@ parameters: sourceBuildPipelineRunId: "" steps: -- template: /eng/common/templates/steps/init-docker-linux.yml@self +- template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self parameters: setupImageBuilder: false setupTestRunner: true @@ -44,7 +44,7 @@ steps: displayName: Start Test Runner Container condition: and(succeeded(), ${{ parameters.condition }}) - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/steps/run-pwsh-with-auth.yml@self + - template: /eng/docker-tools/templates/steps/run-pwsh-with-auth.yml@self parameters: displayName: Docker login serviceConnection: ${{ parameters.publishConfig.testServiceConnection.name }} @@ -52,16 +52,16 @@ steps: command: >- $azLoginArgs = '--service-principal --tenant $env:AZURE_TENANT_ID -u $env:AZURE_CLIENT_ID --federated-token $env:AZURE_FEDERATED_TOKEN'; docker exec -e AZURE_TENANT_ID=$env:tenantId -e AZURE_CLIENT_ID=$env:servicePrincipalId -e AZURE_FEDERATED_TOKEN=$env:idToken $(testRunner.container) pwsh - -File $(engCommonRelativePath)/Invoke-WithRetry.ps1 + -File $(engDockerToolsRelativePath)/Invoke-WithRetry.ps1 "az login $azLoginArgs; az acr login -n ${{ parameters.publishConfig.buildAcr.server }}" - ${{ if eq(parameters.preBuildValidation, 'false') }}: - - template: /eng/common/templates/steps/download-build-artifact.yml@self + - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self parameters: targetPath: $(Build.ArtifactStagingDirectory) artifactName: image-info condition: ${{ parameters.condition }} pipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} -- template: /eng/common/templates/steps/parse-test-arg-arrays.yml@self +- template: /eng/docker-tools/templates/steps/parse-test-arg-arrays.yml@self - powershell: > $(test.init); docker exec diff --git a/eng/common/templates/steps/test-images-windows-client.yml b/eng/docker-tools/templates/steps/test-images-windows-client.yml similarity index 90% rename from eng/common/templates/steps/test-images-windows-client.yml rename to eng/docker-tools/templates/steps/test-images-windows-client.yml index 00fa062fd..ad84cff0e 100644 --- a/eng/common/templates/steps/test-images-windows-client.yml +++ b/eng/docker-tools/templates/steps/test-images-windows-client.yml @@ -7,12 +7,12 @@ parameters: steps: - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/steps/init-docker-windows.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-windows.yml@self parameters: cleanupDocker: true setupImageBuilder: false condition: ${{ parameters.condition }} - - template: /eng/common/templates/steps/run-pwsh-with-auth.yml@self + - template: /eng/docker-tools/templates/steps/run-pwsh-with-auth.yml@self parameters: displayName: Docker login serviceConnection: ${{ parameters.publishConfig.testServiceConnection.name }} @@ -34,13 +34,13 @@ steps: displayName: Cleanup Old Test Results condition: and(succeeded(), ${{ parameters.condition }}) - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/steps/download-build-artifact.yml@self + - template: /eng/docker-tools/templates/steps/download-build-artifact.yml@self parameters: targetPath: $(Build.ArtifactStagingDirectory) artifactName: image-info condition: ${{ parameters.condition }} pipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} -- template: /eng/common/templates/steps/parse-test-arg-arrays.yml@self +- template: /eng/docker-tools/templates/steps/parse-test-arg-arrays.yml@self - powershell: > $(test.init); $(testScriptPath) diff --git a/eng/common/templates/steps/validate-branch.yml b/eng/docker-tools/templates/steps/validate-branch.yml similarity index 100% rename from eng/common/templates/steps/validate-branch.yml rename to eng/docker-tools/templates/steps/validate-branch.yml diff --git a/eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml b/eng/docker-tools/templates/steps/wait-for-mcr-doc-ingestion.yml similarity index 89% rename from eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml rename to eng/docker-tools/templates/steps/wait-for-mcr-doc-ingestion.yml index 05112cc5b..5f64438bb 100644 --- a/eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml +++ b/eng/docker-tools/templates/steps/wait-for-mcr-doc-ingestion.yml @@ -4,7 +4,7 @@ parameters: dryRunArg: "" steps: -- template: /eng/common/templates/steps/run-imagebuilder.yml@self +- template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Wait for MCR Doc Ingestion condition: and(${{ parameters.condition }}, eq(variables['waitForIngestionEnabled'], 'true')) diff --git a/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml b/eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml similarity index 93% rename from eng/common/templates/steps/wait-for-mcr-image-ingestion.yml rename to eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml index f8ad85d57..6c7236439 100644 --- a/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml +++ b/eng/docker-tools/templates/steps/wait-for-mcr-image-ingestion.yml @@ -16,7 +16,7 @@ parameters: default: "true" steps: -- template: /eng/common/templates/steps/run-imagebuilder.yml@self +- template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: Wait for Image Ingestion condition: and(${{ parameters.condition }}, eq(variables['waitForIngestionEnabled'], 'true')) diff --git a/eng/common/templates/task-prefix-decorator.yml b/eng/docker-tools/templates/task-prefix-decorator.yml similarity index 100% rename from eng/common/templates/task-prefix-decorator.yml rename to eng/docker-tools/templates/task-prefix-decorator.yml diff --git a/eng/docker-tools/templates/variables/common-paths.yml b/eng/docker-tools/templates/variables/common-paths.yml new file mode 100644 index 000000000..d8a520025 --- /dev/null +++ b/eng/docker-tools/templates/variables/common-paths.yml @@ -0,0 +1,5 @@ +variables: + engDockerToolsRelativePath: eng/docker-tools + engDockerToolsPath: $(Build.Repository.LocalPath)/$(engDockerToolsRelativePath) + engPath: $(Build.Repository.LocalPath)/eng + testScriptPath: "" diff --git a/eng/common/templates/variables/common.yml b/eng/docker-tools/templates/variables/common.yml similarity index 94% rename from eng/common/templates/variables/common.yml rename to eng/docker-tools/templates/variables/common.yml index 525709f45..cef4424c1 100644 --- a/eng/common/templates/variables/common.yml +++ b/eng/docker-tools/templates/variables/common.yml @@ -1,6 +1,6 @@ variables: -- template: /eng/common/templates/variables/docker-images.yml@self -- template: /eng/common/templates/variables/common-paths.yml@self +- template: /eng/docker-tools/templates/variables/docker-images.yml@self +- template: /eng/docker-tools/templates/variables/common-paths.yml@self - name: publishReadme value: true diff --git a/eng/common/templates/variables/docker-images.yml b/eng/docker-tools/templates/variables/docker-images.yml similarity index 100% rename from eng/common/templates/variables/docker-images.yml rename to eng/docker-tools/templates/variables/docker-images.yml diff --git a/eng/common/templates/variables/dotnet/build-test-publish.yml b/eng/docker-tools/templates/variables/dotnet/build-test-publish.yml similarity index 90% rename from eng/common/templates/variables/dotnet/build-test-publish.yml rename to eng/docker-tools/templates/variables/dotnet/build-test-publish.yml index 94732039b..96a0cf500 100644 --- a/eng/common/templates/variables/dotnet/build-test-publish.yml +++ b/eng/docker-tools/templates/variables/dotnet/build-test-publish.yml @@ -1,7 +1,7 @@ # Common variables for building/testing/publishing in the .NET team's pipelines variables: -- template: /eng/common/templates/variables/dotnet/common.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/common.yml@self - name: commonVersionsImageInfoPath value: build-info/docker @@ -28,7 +28,7 @@ variables: - name: gitHubNotificationsRepoInfo.repo value: dotnet-docker-internal # $(gitHubNotificationsRepoInfo.authArgs) is needed by the "Post Publish -# Notification" step in eng/common/templates/jobs/publish.yml#L271, even during +# Notification" step in eng/docker-tools/templates/jobs/publish.yml#L271, even during # a dry-run. This value is a placeholder that gets replaced when referencing # the secrets.yml variable template. - name: gitHubNotificationsRepoInfo.authArgs diff --git a/eng/common/templates/variables/dotnet/common.yml b/eng/docker-tools/templates/variables/dotnet/common.yml similarity index 92% rename from eng/common/templates/variables/dotnet/common.yml rename to eng/docker-tools/templates/variables/dotnet/common.yml index bb39d82c2..8f98c0921 100644 --- a/eng/common/templates/variables/dotnet/common.yml +++ b/eng/docker-tools/templates/variables/dotnet/common.yml @@ -1,5 +1,5 @@ variables: -- template: /eng/common/templates/variables/common.yml@self +- template: /eng/docker-tools/templates/variables/common.yml@self - name: publicProjectName value: public @@ -7,7 +7,7 @@ variables: value: internal # $(dockerHubRegistryCreds) is needed by the copy-base-images step in -# eng/common/templates/stages/build-and-test.yml#L73-L78, even during a dry-run. +# eng/docker-tools/templates/stages/build-and-test.yml#L73-L78, even during a dry-run. # This is a placeholder that gets replaced when referencing the secrets.yml # variable template. - name: dockerHubRegistryCreds diff --git a/eng/common/templates/variables/dotnet/secrets-unofficial.yml b/eng/docker-tools/templates/variables/dotnet/secrets-unofficial.yml similarity index 100% rename from eng/common/templates/variables/dotnet/secrets-unofficial.yml rename to eng/docker-tools/templates/variables/dotnet/secrets-unofficial.yml diff --git a/eng/common/templates/variables/dotnet/secrets.yml b/eng/docker-tools/templates/variables/dotnet/secrets.yml similarity index 100% rename from eng/common/templates/variables/dotnet/secrets.yml rename to eng/docker-tools/templates/variables/dotnet/secrets.yml diff --git a/eng/image-builder-tag-update-config.json b/eng/image-builder-tag-update-config.json index 802b7f576..3b4e6539f 100644 --- a/eng/image-builder-tag-update-config.json +++ b/eng/image-builder-tag-update-config.json @@ -2,7 +2,7 @@ "commitMessage": "Update Image Builder tag reference", "pullRequestTitle": "Update Image Builder tag reference", "pullRequestDescription": "Updates the common pipeline variables to reference an updated tag of Image Builder.", - "sourcePath": "eng/common/templates/variables/docker-images.yml", + "sourcePath": "eng/docker-tools/templates/variables/docker-images.yml", "workingBranchSuffix": "-image-builder-tag", "repos": [ { diff --git a/eng/pipelines/annotate-eol-digests.yml b/eng/pipelines/annotate-eol-digests.yml index c2de78693..8a364eb31 100644 --- a/eng/pipelines/annotate-eol-digests.yml +++ b/eng/pipelines/annotate-eol-digests.yml @@ -14,7 +14,7 @@ variables: value: "" extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: serviceConnections: - name: $(publish.serviceConnectionName) @@ -27,7 +27,7 @@ extends: - job: AnnotateImages displayName: Annotate EOL Images steps: - - template: /eng/common/templates/steps/init-docker-linux.yml@self - - template: /eng/common/templates/steps/annotate-eol-digests.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/annotate-eol-digests.yml@self parameters: dataFile: /repo/${{ parameters.dataFile }} diff --git a/eng/pipelines/cg-detection.yml b/eng/pipelines/cg-detection.yml index 6f0c192fc..edb69a55f 100644 --- a/eng/pipelines/cg-detection.yml +++ b/eng/pipelines/cg-detection.yml @@ -20,13 +20,13 @@ variables: value: false extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: cgDryRun: ${{ parameters.cgDryRun }} stages: - stage: CgDetection displayName: CG Detection jobs: - - template: /eng/common/templates/jobs/cg-build-projects.yml@self + - template: /eng/docker-tools/templates/jobs/cg-build-projects.yml@self parameters: cgDryRun: ${{ parameters.cgDryRun }} diff --git a/eng/pipelines/check-base-image-updates.yml b/eng/pipelines/check-base-image-updates.yml index 74b99a2c3..ffa9b11cd 100644 --- a/eng/pipelines/check-base-image-updates.yml +++ b/eng/pipelines/check-base-image-updates.yml @@ -12,10 +12,10 @@ schedules: variables: - template: /eng/pipelines/templates/variables/common.yml@self # Uses GitHub token to access the versions repo -- template: /eng/common/templates/variables/dotnet/secrets.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/secrets.yml@self extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: serviceConnections: - name: $(acr-staging.serviceConnectionName) diff --git a/eng/pipelines/cleanup-acr-images-custom-official.yml b/eng/pipelines/cleanup-acr-images-custom-official.yml index e49ef0fc8..7b8ceb9b1 100644 --- a/eng/pipelines/cleanup-acr-images-custom-official.yml +++ b/eng/pipelines/cleanup-acr-images-custom-official.yml @@ -27,12 +27,12 @@ parameters: type: int extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: serviceConnections: - name: $(clean.serviceConnectionName) stages: - - template: /eng/common/templates/stages/dotnet/publish-config-prod.yml@self + - template: /eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml@self parameters: stagesTemplate: /eng/pipelines/templates/stages/cleanup-acr-images-custom.yml@self stagesTemplateParameters: diff --git a/eng/pipelines/cleanup-acr-images-official.yml b/eng/pipelines/cleanup-acr-images-official.yml index feea0e1f4..8c8727af4 100644 --- a/eng/pipelines/cleanup-acr-images-official.yml +++ b/eng/pipelines/cleanup-acr-images-official.yml @@ -22,7 +22,7 @@ variables: readonly: true extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: serviceConnections: # For image removal @@ -31,7 +31,7 @@ extends: - name: $(build.serviceConnectionName) - name: $(public-mirror.serviceConnectionName) stages: - - template: /eng/common/templates/stages/dotnet/publish-config-prod.yml@self + - template: /eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml@self parameters: stagesTemplate: /eng/pipelines/templates/stages/cleanup-acr-images.yml@self stagesTemplateParameters: diff --git a/eng/pipelines/cleanup-acr-images-unofficial.yml b/eng/pipelines/cleanup-acr-images-unofficial.yml index 0d787cef3..9eed550f0 100644 --- a/eng/pipelines/cleanup-acr-images-unofficial.yml +++ b/eng/pipelines/cleanup-acr-images-unofficial.yml @@ -14,7 +14,7 @@ variables: readonly: true extends: - template: /eng/common/templates/1es-unofficial.yml@self + template: /eng/docker-tools/templates/1es-unofficial.yml@self parameters: serviceConnections: # For image removal @@ -23,7 +23,7 @@ extends: - name: $(build-test.serviceConnectionName) - name: $(public-mirror.serviceConnectionName) stages: - - template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self + - template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self parameters: stagesTemplate: /eng/pipelines/templates/stages/cleanup-acr-images.yml@self stagesTemplateParameters: diff --git a/eng/pipelines/dotnet-buildtools-image-builder-official.yml b/eng/pipelines/dotnet-buildtools-image-builder-official.yml index f114076fb..cd4c6d16c 100644 --- a/eng/pipelines/dotnet-buildtools-image-builder-official.yml +++ b/eng/pipelines/dotnet-buildtools-image-builder-official.yml @@ -24,7 +24,7 @@ variables: sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} # Uses GitHub token to access the versions repo # Also uses DockerHub registry creds to avoid rate limiting -- template: /eng/common/templates/variables/dotnet/secrets.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/secrets.yml@self - name: publishEolAnnotations value: true @@ -37,12 +37,12 @@ resources: ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }} extends: - template: /eng/common/templates/1es.yml@self + template: /eng/docker-tools/templates/1es.yml@self parameters: reposToExcludeFromScanning: - VersionsRepo stages: - - template: /eng/common/templates/stages/dotnet/publish-config-prod.yml@self + - template: /eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml@self parameters: sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} stagesTemplate: /eng/pipelines/templates/stages/build-test-publish.yml@self diff --git a/eng/pipelines/dotnet-buildtools-image-builder-pr.yml b/eng/pipelines/dotnet-buildtools-image-builder-pr.yml index 9600381b2..ebbb72024 100644 --- a/eng/pipelines/dotnet-buildtools-image-builder-pr.yml +++ b/eng/pipelines/dotnet-buildtools-image-builder-pr.yml @@ -7,7 +7,7 @@ pr: include: - eng/pipelines/dotnet-buildtools-image-builder-pr.yml - eng/pipelines/templates/* - - eng/common/templates/* + - eng/docker-tools/templates/* - src/* trigger: none @@ -26,7 +26,7 @@ resources: ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }} stages: -- template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self +- template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self parameters: sourceBuildPipelineRunId: $(Build.BuildId) stagesTemplate: /eng/pipelines/templates/stages/build-test-publish.yml@self diff --git a/eng/pipelines/dotnet-buildtools-image-builder-unofficial.yml b/eng/pipelines/dotnet-buildtools-image-builder-unofficial.yml index d7a47a604..ca2695b56 100644 --- a/eng/pipelines/dotnet-buildtools-image-builder-unofficial.yml +++ b/eng/pipelines/dotnet-buildtools-image-builder-unofficial.yml @@ -16,7 +16,7 @@ variables: parameters: sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} # Uses DockerHub registry creds to avoid rate limiting during CopyBaseImages job -- template: /eng/common/templates/variables/dotnet/secrets-unofficial.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/secrets-unofficial.yml@self - name: "publishEolAnnotations" value: false readonly: true @@ -45,12 +45,12 @@ resources: ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }} extends: - template: /eng/common/templates/1es.yml@self + template: /eng/docker-tools/templates/1es.yml@self parameters: reposToExcludeFromScanning: - VersionsRepo stages: - - template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self + - template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self parameters: sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} stagesTemplate: /eng/pipelines/templates/stages/build-test-publish.yml@self diff --git a/eng/pipelines/dotnet-docker-tools-eng-validation-official.yml b/eng/pipelines/dotnet-docker-tools-eng-validation-official.yml index cfe721479..42d1a11b0 100644 --- a/eng/pipelines/dotnet-docker-tools-eng-validation-official.yml +++ b/eng/pipelines/dotnet-docker-tools-eng-validation-official.yml @@ -28,12 +28,12 @@ resources: ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }} extends: - template: /eng/common/templates/1es.yml@self + template: /eng/docker-tools/templates/1es.yml@self parameters: reposToExcludeFromScanning: - VersionsRepo stages: - - template: /eng/common/templates/stages/dotnet/publish-config-prod.yml@self + - template: /eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml@self parameters: sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} publishRepoPrefix: "test/" diff --git a/eng/pipelines/dotnet-docker-tools-eng-validation-pr.yml b/eng/pipelines/dotnet-docker-tools-eng-validation-pr.yml index 2934e58b6..42e5c0d99 100644 --- a/eng/pipelines/dotnet-docker-tools-eng-validation-pr.yml +++ b/eng/pipelines/dotnet-docker-tools-eng-validation-pr.yml @@ -21,7 +21,7 @@ resources: ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }} stages: -- template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self +- template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self parameters: stagesTemplate: /eng/pipelines/templates/stages/build-test-publish.yml@self stagesTemplateParameters: diff --git a/eng/pipelines/dotnet-docker-tools-eng-validation-unofficial.yml b/eng/pipelines/dotnet-docker-tools-eng-validation-unofficial.yml index ce9d7c51f..802ace578 100644 --- a/eng/pipelines/dotnet-docker-tools-eng-validation-unofficial.yml +++ b/eng/pipelines/dotnet-docker-tools-eng-validation-unofficial.yml @@ -20,12 +20,12 @@ resources: ref: ${{ variables['gitHubVersionsRepoInfo.branch'] }} extends: - template: /eng/common/templates/1es.yml@self + template: /eng/docker-tools/templates/1es.yml@self parameters: reposToExcludeFromScanning: - VersionsRepo stages: - - template: /eng/common/templates/stages/dotnet/publish-config-nonprod.yml@self + - template: /eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml@self parameters: sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} publishRepoPrefix: "test/" diff --git a/eng/pipelines/import-image.yml b/eng/pipelines/import-image.yml index 1cf038342..239a8b5ff 100644 --- a/eng/pipelines/import-image.yml +++ b/eng/pipelines/import-image.yml @@ -34,7 +34,7 @@ variables: value: '' extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: stages: - stage: Import @@ -42,7 +42,7 @@ extends: jobs: - job: Import steps: - - template: /eng/common/templates/steps/run-pwsh-with-auth.yml@self + - template: /eng/docker-tools/templates/steps/run-pwsh-with-auth.yml@self parameters: displayName: Import image serviceConnection: $(public-mirror.serviceConnectionName) diff --git a/eng/pipelines/mirror-base-images.yml b/eng/pipelines/mirror-base-images.yml index dcb63c11d..5c5556239 100644 --- a/eng/pipelines/mirror-base-images.yml +++ b/eng/pipelines/mirror-base-images.yml @@ -16,14 +16,14 @@ parameters: default: false variables: -- template: /eng/common/templates/variables/dotnet/common.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/common.yml@self # Uses DockerHub registry creds to avoid rate limiting -- template: /eng/common/templates/variables/dotnet/secrets.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/secrets.yml@self - name: mirrorRepoPrefix value: "" extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: serviceConnections: - name: $(public-mirror.serviceConnectionName) diff --git a/eng/pipelines/push-common-updates.yml b/eng/pipelines/push-common-updates.yml index 82d2531e7..e242fd100 100644 --- a/eng/pipelines/push-common-updates.yml +++ b/eng/pipelines/push-common-updates.yml @@ -5,13 +5,13 @@ trigger: - main paths: include: - - eng/common/* + - eng/docker-tools/* pr: none variables: - template: /eng/pipelines/templates/variables/common.yml # Uses GitHub token to submit pull requests -- template: /eng/common/templates/variables/dotnet/secrets.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/secrets.yml@self jobs: - job: Build @@ -24,7 +24,7 @@ jobs: - script: > docker run --rm file-pusher $(filters) - ./eng/eng-common-file-pusher-config.json + ./eng/docker-tools-file-pusher-config.json $(dotnetDockerBot.userName) $(dotnetDockerBot.email) $(BotAccount-dotnet-docker-bot-PAT) diff --git a/eng/pipelines/secret-management-weekly.yml b/eng/pipelines/secret-management-weekly.yml index af3ee208c..c416b8f11 100644 --- a/eng/pipelines/secret-management-weekly.yml +++ b/eng/pipelines/secret-management-weekly.yml @@ -12,7 +12,7 @@ variables: - template: templates/variables/common.yml extends: - template: /eng/common/templates/1es-unofficial.yml@self + template: /eng/docker-tools/templates/1es-unofficial.yml@self parameters: stages: - stage: SynchronizeSecrets diff --git a/eng/pipelines/templates/jobs/check-base-image-updates.yml b/eng/pipelines/templates/jobs/check-base-image-updates.yml index 4bc3613b6..7c42b4d8d 100644 --- a/eng/pipelines/templates/jobs/check-base-image-updates.yml +++ b/eng/pipelines/templates/jobs/check-base-image-updates.yml @@ -12,8 +12,8 @@ jobs: image: $(default1ESInternalPoolImage) os: linux steps: - - template: /eng/common/templates/steps/init-docker-linux.yml@self - - template: /eng/common/templates/steps/copy-base-images.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/copy-base-images.yml@self parameters: acr: server: $(acr-staging.server) diff --git a/eng/pipelines/templates/jobs/copy-base-images-public-mirror.yml b/eng/pipelines/templates/jobs/copy-base-images-public-mirror.yml index 83173c8af..be933465c 100644 --- a/eng/pipelines/templates/jobs/copy-base-images-public-mirror.yml +++ b/eng/pipelines/templates/jobs/copy-base-images-public-mirror.yml @@ -13,7 +13,7 @@ parameters: default: false jobs: -- template: /eng/common/templates/jobs/copy-base-images.yml@self +- template: /eng/docker-tools/templates/jobs/copy-base-images.yml@self parameters: name: MirrorBaseImages_${{ parameters.name }} pool: diff --git a/eng/pipelines/templates/stages/build-test-publish.yml b/eng/pipelines/templates/stages/build-test-publish.yml index 723b27856..945c35d47 100644 --- a/eng/pipelines/templates/stages/build-test-publish.yml +++ b/eng/pipelines/templates/stages/build-test-publish.yml @@ -31,7 +31,7 @@ parameters: stages: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - - template: /eng/common/templates/stages/setup-service-connections.yml@self + - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self parameters: serviceConnections: - name: ${{ parameters.publishConfig.internalMirrorAcr.serviceConnection.name }} @@ -40,7 +40,7 @@ stages: - ${{ each serviceConnection in parameters.additionalServiceConnections }}: - name: ${{ serviceConnection.name }} -- template: /eng/common/templates/stages/dotnet/build-test-publish-repo.yml@self +- template: /eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml@self parameters: noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} diff --git a/eng/pipelines/templates/stages/cleanup-acr-images-custom.yml b/eng/pipelines/templates/stages/cleanup-acr-images-custom.yml index 87efd83ee..3709436d7 100644 --- a/eng/pipelines/templates/stages/cleanup-acr-images-custom.yml +++ b/eng/pipelines/templates/stages/cleanup-acr-images-custom.yml @@ -24,8 +24,8 @@ stages: variables: dryRunArg: ${{ iif(parameters.enableDryRun, '--dry-run', '') }} steps: - - template: /eng/common/templates/steps/init-docker-linux.yml@self - - template: /eng/common/templates/steps/clean-acr-images.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/clean-acr-images.yml@self parameters: internalProjectName: internal repo: ${{ parameters.repo }} diff --git a/eng/pipelines/templates/stages/cleanup-acr-images.yml b/eng/pipelines/templates/stages/cleanup-acr-images.yml index 068539329..f7f0b1ed3 100644 --- a/eng/pipelines/templates/stages/cleanup-acr-images.yml +++ b/eng/pipelines/templates/stages/cleanup-acr-images.yml @@ -15,13 +15,13 @@ parameters: stages: - stage: Execute dependsOn: [] - jobs: + jobs: - job: Clean variables: dryRunArg: ${{ iif(parameters.enableDryRun, '--dry-run', '') }} steps: - - template: /eng/common/templates/steps/init-docker-linux.yml@self - - template: /eng/common/templates/steps/clean-acr-images.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/clean-acr-images.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} internalProjectName: ${{ parameters.internalProjectName }} @@ -29,7 +29,7 @@ stages: acr: ${{ parameters.publishConfig.buildAcr }} action: delete age: 15 - - template: /eng/common/templates/steps/clean-acr-images.yml@self + - template: /eng/docker-tools/templates/steps/clean-acr-images.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} internalProjectName: ${{ parameters.internalProjectName }} @@ -37,7 +37,7 @@ stages: acr: ${{ parameters.publishConfig.publishAcr }} action: pruneEol age: 15 - - template: /eng/common/templates/steps/clean-acr-images.yml@self + - template: /eng/docker-tools/templates/steps/clean-acr-images.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} internalProjectName: ${{ parameters.internalProjectName }} @@ -45,7 +45,7 @@ stages: acr: ${{ parameters.publishConfig.publishAcr }} action: pruneAll age: 7 - - template: /eng/common/templates/steps/clean-acr-images.yml@self + - template: /eng/docker-tools/templates/steps/clean-acr-images.yml@self parameters: publishConfig: ${{ parameters.publishConfig }} internalProjectName: ${{ parameters.internalProjectName }} @@ -55,7 +55,7 @@ stages: age: 15 customArgs: $(excludedBuildToolsPrereqsImagesArgs) # Disabled due to https://github.com/dotnet/docker-tools/issues/797 - # - template: ../common/templates/steps/clean-acr-images.yml + # - template: /eng/docker-tools/templates/steps/clean-acr-images.yml@self # parameters: # publishConfig: ${{ parameters.publishConfig }} # repo: "mirror/*" @@ -67,7 +67,7 @@ stages: variables: dryRunArg: ${{ iif(parameters.enableDryRun, '--dry-run', '') }} steps: - - template: /eng/common/templates/steps/init-docker-linux.yml@self + - template: /eng/docker-tools/templates/steps/init-docker-linux.yml@self - script: mkdir -p $(Build.ArtifactStagingDirectory)/eol-annotation-data displayName: Create EOL Annotation Data Directory - template: /eng/pipelines/templates/steps/set-eol-annotations.yml@self @@ -76,7 +76,7 @@ stages: - template: /eng/pipelines/templates/steps/set-eol-annotations.yml@self parameters: acr: ${{ parameters.publishConfig.publicMirrorAcr }} - - template: /eng/common/templates/steps/publish-artifact.yml@self + - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self parameters: path: $(Build.ArtifactStagingDirectory)/eol-annotation-data artifactName: eol-annotation-data-$(System.JobAttempt) diff --git a/eng/pipelines/templates/steps/set-eol-annotations.yml b/eng/pipelines/templates/steps/set-eol-annotations.yml index 887ab238a..db33a7479 100644 --- a/eng/pipelines/templates/steps/set-eol-annotations.yml +++ b/eng/pipelines/templates/steps/set-eol-annotations.yml @@ -4,7 +4,7 @@ parameters: default: null steps: - - template: /eng/common/templates/steps/run-imagebuilder.yml@self + - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: displayName: "Generate EOL Data for all images in ${{ parameters.acr.server }}" serviceConnections: @@ -20,7 +20,7 @@ steps: '$(artifactsPath)/eol-annotation-data/eol-annotation-data-${{ parameters.acr.server }}.json' $(dryRunArg) - - template: /eng/common/templates/steps/annotate-eol-digests.yml@self + - template: /eng/docker-tools/templates/steps/annotate-eol-digests.yml@self parameters: acr: ${{ parameters.acr }} dataFile: $(artifactsPath)/eol-annotation-data/eol-annotation-data-${{ parameters.acr.server }}.json diff --git a/eng/pipelines/templates/variables/build-test-publish.yml b/eng/pipelines/templates/variables/build-test-publish.yml index 2d1fb22ea..42b8e2ffe 100644 --- a/eng/pipelines/templates/variables/build-test-publish.yml +++ b/eng/pipelines/templates/variables/build-test-publish.yml @@ -1,5 +1,5 @@ variables: - template: /eng/pipelines/templates/variables/common.yml@self -- template: /eng/common/templates/variables/dotnet/build-test-publish.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/build-test-publish.yml@self - name: publicSourceBranch value: main diff --git a/eng/pipelines/templates/variables/common.yml b/eng/pipelines/templates/variables/common.yml index dd4d88320..8c354f5fe 100644 --- a/eng/pipelines/templates/variables/common.yml +++ b/eng/pipelines/templates/variables/common.yml @@ -1,2 +1,2 @@ variables: -- template: /eng/common/templates/variables/dotnet/common.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/common.yml@self diff --git a/eng/pipelines/update-image-builder-tag.yml b/eng/pipelines/update-image-builder-tag.yml index 1a7239c98..95f6fce76 100644 --- a/eng/pipelines/update-image-builder-tag.yml +++ b/eng/pipelines/update-image-builder-tag.yml @@ -15,7 +15,7 @@ resources: variables: - template: /eng/pipelines/templates/variables/common.yml # Uses GitHub token to submit pull requests -- template: /eng/common/templates/variables/dotnet/secrets.yml@self +- template: /eng/docker-tools/templates/variables/dotnet/secrets.yml@self jobs: - job: Build diff --git a/eng/pipelines/upload-file.yml b/eng/pipelines/upload-file.yml index 065bdb311..072be2d4c 100644 --- a/eng/pipelines/upload-file.yml +++ b/eng/pipelines/upload-file.yml @@ -16,7 +16,7 @@ variables: - template: /eng/pipelines/templates/variables/common.yml@self extends: - template: /eng/common/templates/1es-official.yml@self + template: /eng/docker-tools/templates/1es-official.yml@self parameters: stages: - stage: UploadFile diff --git a/src/ImageBuilder/Commands/CleanAcrImagesOptions.cs b/src/ImageBuilder/Commands/CleanAcrImagesOptions.cs index f1b8c4187..4ee172bf4 100644 --- a/src/ImageBuilder/Commands/CleanAcrImagesOptions.cs +++ b/src/ImageBuilder/Commands/CleanAcrImagesOptions.cs @@ -62,7 +62,7 @@ .. _serviceConnectionOptionsBuilder.GetCliOptions( // Keep the following templates in sync with these values: // - eng/pipelines/cleanup-acr-images-custom-official.yml - // - eng/common/templates/steps/clean-acr-images.yml + // - eng/docker-tools/templates/steps/clean-acr-images.yml public enum CleanAcrImagesAction { /// diff --git a/src/build.ps1 b/src/build.ps1 index 3244f98ef..74e0f31cf 100644 --- a/src/build.ps1 +++ b/src/build.ps1 @@ -1,7 +1,7 @@ Set-StrictMode -Version Latest $ErrorActionPreference = 'Stop' -& ./../../eng/common/build.ps1 ` +& ./../../eng/docker-tools/build.ps1 ` -Manifest src/manifest.json ` -OptionalImageBuilderArgs "--var UniqueId=$(Get-Date -Format yyyyMMddHHmmss)" ` -Paths "*" diff --git a/src/run-tests.ps1 b/src/run-tests.ps1 index b3cd81a6f..291281fca 100644 --- a/src/run-tests.ps1 +++ b/src/run-tests.ps1 @@ -32,7 +32,7 @@ if ($TestCategories.Contains("pre-build")) { if ($TestCategories.Contains("functional")) { try { - & ../eng/common/Install-DotNetSdk.ps1 $dotnetInstallDir + & ../eng/docker-tools/Install-DotNetSdk.ps1 $dotnetInstallDir $cmd = "$DotnetInstallDir/dotnet test $PSScriptRoot/ImageBuilder.Tests/Microsoft.DotNet.ImageBuilder.Tests.csproj --logger:trx"