From 39f6e74e3a44ffd4d19346ed92bd60221a15179e Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 14 May 2024 14:50:13 -0700 Subject: [PATCH] Use SBOM Manifest Generator Task from 1ES PT (#5464) --- eng/common/templates/jobs/build-images.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/eng/common/templates/jobs/build-images.yml b/eng/common/templates/jobs/build-images.yml index 99c13dd46..62260b7c7 100644 --- a/eng/common/templates/jobs/build-images.yml +++ b/eng/common/templates/jobs/build-images.yml @@ -134,13 +134,8 @@ jobs: internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} - ${{ if and(eq(variables['System.TeamProject'], parameters.internalProjectName), ne(variables['Build.Reason'], 'PullRequest')) }}: - # Define the task here to load it into the agent so that we can invoke the tool manually - # TODO: Revert the build-specific pinned version when https://github.com/dotnet/docker-tools/issues/1152 is fixed - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0.197.56 - inputs: - BuildDropPath: $(Build.ArtifactStagingDirectory) - displayName: Load Manifest Generator - condition: and(succeeded(), ne(variables['BuildImages.builtImages'], '')) + # The following task depends on the SBOM Manifest Generator task installed on the agent. + # This task is auto-injected by 1ES Pipeline Templates so we don't need to install it ourselves. - powershell: | $images = "$(BuildImages.builtImages)" if (-not $images) { return 0 }