From 9c2aa1ed8390180ed13133958f73018d6d599d8a Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Wed, 27 Aug 2025 14:41:03 +0800 Subject: [PATCH 1/3] Update SBOM task conditions to support IndividualCI builds --- azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d155a92975f..8d4395f1fdf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -226,7 +226,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: 'build_scripts/windows/out/' @@ -272,7 +272,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: 'build_scripts/windows/out/' @@ -374,7 +374,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -457,7 +457,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -629,7 +629,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -742,7 +742,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -840,7 +840,7 @@ jobs: filePath: scripts/release/rpm/pipeline.sh - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -969,7 +969,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: eq(variables['Build.Reason'], 'BatchedCI') + condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) From 1527327d04d3cff565dc205d4947950d70bea953 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Wed, 27 Aug 2025 14:50:48 +0800 Subject: [PATCH 2/3] Remove 'continueOnError' from SBOM tasks for BatchedCI and IndividualCI builds --- azure-pipelines.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8d4395f1fdf..4b72d3e9c20 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -227,7 +227,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: 'build_scripts/windows/out/' @@ -273,7 +272,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: 'build_scripts/windows/out/' @@ -375,7 +373,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) DockerImagesToScan: 'clibuild$BUILD_BUILDNUMBER:latest' @@ -458,7 +455,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -630,7 +626,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -743,7 +738,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -841,7 +835,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) - task: PublishPipelineArtifact@0 @@ -970,7 +963,6 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') - continueOnError: true inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) From 26c43c29cdedb386c76e2c55aedc3cf89b343aa6 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Wed, 27 Aug 2025 16:40:09 +0800 Subject: [PATCH 3/3] Update SBOM task conditions to trigger on release branches only --- azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4b72d3e9c20..6e9d72a1c3c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -226,7 +226,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: 'build_scripts/windows/out/' @@ -271,7 +271,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: 'build_scripts/windows/out/' @@ -372,7 +372,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) DockerImagesToScan: 'clibuild$BUILD_BUILDNUMBER:latest' @@ -454,7 +454,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -625,7 +625,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -737,7 +737,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) @@ -834,7 +834,7 @@ jobs: filePath: scripts/release/rpm/pipeline.sh - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: $(Build.ArtifactStagingDirectory) - task: PublishPipelineArtifact@0 @@ -962,7 +962,7 @@ jobs: - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 displayName: 'SBOM' - condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI') + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') inputs: BuildDropPath: $(Build.ArtifactStagingDirectory)