From 82b76ba338f54ef545d4443946813e083f65fe45 Mon Sep 17 00:00:00 2001 From: "azure-sdk-automation[bot]" <191533747+azure-sdk-automation[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2026 16:20:08 -0700 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 17410 (#4046) Allow callers to configure SBOM generation timeout Preserve the 30-minute default and pass caller overrides to the 1ES artifact task. Co-authored-by: jennypng <63012604+JennyPng@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: ef492680-d50c-4348-967b-88a98f5c04c1 --- eng/common/pipelines/templates/steps/publish-1es-artifact.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml index 30d38828e..55bad0c74 100644 --- a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml +++ b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml @@ -6,12 +6,14 @@ # ArtifactPath - The path we will be publishing. # CustomCondition - Used if there is additional logic necessary to prevent attempt of publish. # SbomEnabled - Set whether to auto-inject 1es pipeline template sbom tasks +# SbomGenerationTimeoutInMinutes - Budget for each injected SBOM generation task and its runner. parameters: ArtifactName: '' ArtifactPath: '' CustomCondition: true SbomEnabled: true + SbomGenerationTimeoutInMinutes: 30 steps: - pwsh: | @@ -31,6 +33,7 @@ steps: inputs: artifactName: '$(PublishArtifactName)' targetPath: '${{ parameters.ArtifactPath }}' + sbomGenerationTimeoutInMinutes: ${{ parameters.SbomGenerationTimeoutInMinutes }} # Disable sbom generation by default for our public or pull request validation builds to avoid unnecessary work ${{ if or(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: sbomEnabled: false