Sync eng/common directory with azure-sdk-tools for PR 9331 (#31460)

* Common cleanup with the docs docker images no longer being used * Remove docker-pull-image.yml --------- Co-authored-by: James Suplizio <[email protected]>
Azure · Nov 7, 2024 · 8f6abd8 · 8f6abd8
1 parent 9502bc2
commit 8f6abd8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 45 deletions.
diff --git a/eng/common/pipelines/templates/steps/docker-pull-image.yml b/eng/common/pipelines/templates/steps/docker-pull-image.yml
diff --git a/eng/common/pipelines/templates/steps/update-docsms-metadata.yml b/eng/common/pipelines/templates/steps/update-docsms-metadata.yml
@@ -29,9 +29,6 @@ parameters:
   - name: PackageSourceOverride
     type: string
     default: ''
-  - name: DocValidationImageId
-    type: string
-    default: ''
 steps:
   - ${{ if eq(length(parameters.PackageInfoLocations), 0) }}:
     - pwsh: |
@@ -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.
@@ -97,7 +89,6 @@ steps:
           -DocRepoLocation "$(DocRepoLocation)" `
           -Language '${{parameters.Language}}' `
           -RepoId '${{ parameters.RepoId }}' `
-          -DocValidationImageId '${{ parameters.DocValidationImageId }}' `
           -PackageSourceOverride '${{ parameters.PackageSourceOverride }}'
       displayName: Apply Documentation Updates
 

diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1
@@ -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(
@@ -47,9 +43,6 @@ param(
   [Parameter(Mandatory = $false)]
   [string]$RepoId,
 
-  [Parameter(Mandatory = $false)]
-  [string]$DocValidationImageId,
-
   [Parameter(Mandatory = $false)]
   [string]$PackageSourceOverride
 )
@@ -200,7 +193,6 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
     $isValid = &$ValidateDocsMsPackagesFn `
       -PackageInfos $packageInfo `
       -PackageSourceOverride $PackageSourceOverride `
-      -DocValidationImageId $DocValidationImageId `
       -DocRepoLocation $DocRepoLocation
 
     if (!$isValid) {

diff --git a/eng/common/scripts/Update-DocsMsPackages.ps1 b/eng/common/scripts/Update-DocsMsPackages.ps1
@@ -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)
@@ -61,7 +54,6 @@ function PackageIsValidForDocsOnboarding($package) {
 
   return &$ValidateDocsMsPackagesFn `
     -PackageInfo $package `
-    -DocValidationImageId $ImageId `
     -DocRepoLocation $DocRepoLocation
 }