Skip to content

Commit 8accf95

Browse files
Sync eng/common directory with azure-sdk-tools for PR 9331 (Azure#1904)
* Common cleanup with the docs docker images no longer being used * Remove docker-pull-image.yml --------- Co-authored-by: James Suplizio <[email protected]>
1 parent fbbd758 commit 8accf95

File tree

4 files changed

+1
-45
lines changed

4 files changed

+1
-45
lines changed

eng/common/pipelines/templates/steps/docker-pull-image.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

eng/common/pipelines/templates/steps/update-docsms-metadata.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ parameters:
2929
- name: PackageSourceOverride
3030
type: string
3131
default: ''
32-
- name: DocValidationImageId
33-
type: string
34-
default: ''
3532
steps:
3633
- ${{ if eq(length(parameters.PackageInfoLocations), 0) }}:
3734
- pwsh: |
@@ -83,11 +80,6 @@ steps:
8380
parameters:
8481
WorkingDirectory: $(DocRepoLocation)
8582
DefaultBranchVariableName: TargetBranchName
86-
# Pull and build the docker image.
87-
- ${{ if ne(parameters.DocValidationImageId, '') }}:
88-
- template: /eng/common/pipelines/templates/steps/docker-pull-image.yml
89-
parameters:
90-
ImageId: '${{ parameters.DocValidationImageId }}'
9183
- pwsh: |
9284
$packageInfoJson = '${{ convertToJson(parameters.PackageInfoLocations) }}'.Trim('"').Replace("\\", "/")
9385
# Without -NoEnumerate, a single element array[T] gets unwrapped as a single item T.
@@ -97,7 +89,6 @@ steps:
9789
-DocRepoLocation "$(DocRepoLocation)" `
9890
-Language '${{parameters.Language}}' `
9991
-RepoId '${{ parameters.RepoId }}' `
100-
-DocValidationImageId '${{ parameters.DocValidationImageId }}' `
10192
-PackageSourceOverride '${{ parameters.PackageSourceOverride }}'
10293
displayName: Apply Documentation Updates
10394

eng/common/scripts/Update-DocsMsMetadata.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ Programming language to supply to metadata
2828
.PARAMETER RepoId
2929
GitHub repository ID of the SDK. Typically of the form: 'Azure/azure-sdk-for-js'
3030
31-
.PARAMETER DocValidationImageId
32-
The docker image id in format of '$containerRegistry/$imageName:$tag'
33-
e.g. azuresdkimages.azurecr.io/jsrefautocr:latest
34-
3531
#>
3632

3733
param(
@@ -47,9 +43,6 @@ param(
4743
[Parameter(Mandatory = $false)]
4844
[string]$RepoId,
4945

50-
[Parameter(Mandatory = $false)]
51-
[string]$DocValidationImageId,
52-
5346
[Parameter(Mandatory = $false)]
5447
[string]$PackageSourceOverride
5548
)
@@ -200,7 +193,6 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
200193
$isValid = &$ValidateDocsMsPackagesFn `
201194
-PackageInfos $packageInfo `
202195
-PackageSourceOverride $PackageSourceOverride `
203-
-DocValidationImageId $DocValidationImageId `
204196
-DocRepoLocation $DocRepoLocation
205197

206198
if (!$isValid) {

eng/common/scripts/Update-DocsMsPackages.ps1

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,13 @@ docs generation from pacakges which are not published to the default feed). This
2020
variable is meant to be used in the domain-specific business logic in
2121
&$UpdateDocsMsPackagesFn
2222
23-
.PARAMETER ImageId
24-
Optional The docker image for package validation in format of '$containerRegistry/$imageName:$tag'.
25-
e.g. azuresdkimages.azurecr.io/jsrefautocr:latest
26-
2723
#>
2824
param (
2925
[Parameter(Mandatory = $true)]
3026
[string] $DocRepoLocation, # the location of the cloned doc repo
3127

3228
[Parameter(Mandatory = $false)]
33-
[string] $PackageSourceOverride,
34-
35-
[Parameter(Mandatory = $false)]
36-
[string] $ImageId
29+
[string] $PackageSourceOverride
3730
)
3831

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

6255
return &$ValidateDocsMsPackagesFn `
6356
-PackageInfo $package `
64-
-DocValidationImageId $ImageId `
6557
-DocRepoLocation $DocRepoLocation
6658
}
6759

0 commit comments

Comments
 (0)