Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Sync eng/common directory with azure-sdk-tools for PR 9331 #47018

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 9331 #47018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d74932
Common cleanup with the docs docker images no longer being used
JimSuplizio Nov 5, 2024
39d1c18
Remove docker-pull-image.yml
JimSuplizio Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions eng/common/pipelines/templates/steps/docker-pull-image.yml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions eng/common/pipelines/templates/steps/update-docsms-metadata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ parameters:
- name: PackageSourceOverride
type: string
default: ''
- name: DocValidationImageId
type: string
default: ''
steps:
- ${{ if eq(length(parameters.PackageInfoLocations), 0) }}:
- pwsh: |
Expand Down Expand Up @@ -83,11 +80,6 @@ steps:
parameters:
WorkingDirectory: $(DocRepoLocation)
DefaultBranchVariableName: TargetBranchName
# Pull and build the docker image.
- ${{ if ne(parameters.DocValidationImageId, '') }}:
- template: /eng/common/pipelines/templates/steps/docker-pull-image.yml
parameters:
ImageId: '${{ parameters.DocValidationImageId }}'
- pwsh: |
$packageInfoJson = '${{ convertToJson(parameters.PackageInfoLocations) }}'.Trim('"').Replace("\\", "/")
# Without -NoEnumerate, a single element array[T] gets unwrapped as a single item T.
Expand All @@ -97,7 +89,6 @@ steps:
-DocRepoLocation "$(DocRepoLocation)" `
-Language '${{parameters.Language}}' `
-RepoId '${{ parameters.RepoId }}' `
-DocValidationImageId '${{ parameters.DocValidationImageId }}' `
-PackageSourceOverride '${{ parameters.PackageSourceOverride }}'
displayName: Apply Documentation Updates

Expand Down
8 changes: 0 additions & 8 deletions eng/common/scripts/Update-DocsMsMetadata.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ Programming language to supply to metadata
.PARAMETER RepoId
GitHub repository ID of the SDK. Typically of the form: 'Azure/azure-sdk-for-js'

.PARAMETER DocValidationImageId
The docker image id in format of '$containerRegistry/$imageName:$tag'
e.g. azuresdkimages.azurecr.io/jsrefautocr:latest

#>

param(
Expand All @@ -47,9 +43,6 @@ param(
[Parameter(Mandatory = $false)]
[string]$RepoId,

[Parameter(Mandatory = $false)]
[string]$DocValidationImageId,

[Parameter(Mandatory = $false)]
[string]$PackageSourceOverride
)
Expand Down Expand Up @@ -200,7 +193,6 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
$isValid = &$ValidateDocsMsPackagesFn `
-PackageInfos $packageInfo `
-PackageSourceOverride $PackageSourceOverride `
-DocValidationImageId $DocValidationImageId `
-DocRepoLocation $DocRepoLocation

if (!$isValid) {
Expand Down
10 changes: 1 addition & 9 deletions eng/common/scripts/Update-DocsMsPackages.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,13 @@ docs generation from pacakges which are not published to the default feed). This
variable is meant to be used in the domain-specific business logic in
&$UpdateDocsMsPackagesFn

.PARAMETER ImageId
Optional The docker image for package validation in format of '$containerRegistry/$imageName:$tag'.
e.g. azuresdkimages.azurecr.io/jsrefautocr:latest

#>
param (
[Parameter(Mandatory = $true)]
[string] $DocRepoLocation, # the location of the cloned doc repo

[Parameter(Mandatory = $false)]
[string] $PackageSourceOverride,

[Parameter(Mandatory = $false)]
[string] $ImageId
[string] $PackageSourceOverride
)

. (Join-Path $PSScriptRoot common.ps1)
Expand Down Expand Up @@ -61,7 +54,6 @@ function PackageIsValidForDocsOnboarding($package) {

return &$ValidateDocsMsPackagesFn `
-PackageInfo $package `
-DocValidationImageId $ImageId `
-DocRepoLocation $DocRepoLocation
}

Expand Down