Skip to content

{CI} Update SBOM task conditions to trigger on release branches only#32008

Merged
wangzelin007 merged 3 commits intoAzure:devfrom
wangzelin007:wzl/fix-sbom2
Sep 1, 2025
Merged

{CI} Update SBOM task conditions to trigger on release branches only#32008
wangzelin007 merged 3 commits intoAzure:devfrom
wangzelin007:wzl/fix-sbom2

Conversation

@wangzelin007
Copy link
Member

@wangzelin007 wangzelin007 commented Aug 27, 2025

SBOM task
The SBOM task has consistently failed in recent pull requests, with the error shown in the screenshot below. According to the SBOM team, the SBOM task should not be used in non-customer-facing builds.
In #31994, we updated the task’s execution condition to BatchedCI which is incorrect.
This PR will update SBOM task conditions to trigger on release branches only, which is used during the official CLI release build.
image

Related command

Description

Testing Guide

History Notes

[Component Name 1] BREAKING CHANGE: az command a: Make some customer-facing breaking change
[Component Name 2] az command b: Add some customer-facing feature


This checklist is used to make sure that common guidelines for a pull request are followed.

Copilot AI review requested due to automatic review settings August 27, 2025 06:49
@azure-client-tools-bot-prd
Copy link

azure-client-tools-bot-prd bot commented Aug 27, 2025

️✔️AzureCLI-FullTest
️✔️acr
️✔️latest
️✔️3.12
️✔️3.13
️✔️acs
️✔️latest
️✔️3.12
️✔️3.13
️✔️advisor
️✔️latest
️✔️3.12
️✔️3.13
️✔️ams
️✔️latest
️✔️3.12
️✔️3.13
️✔️apim
️✔️latest
️✔️3.12
️✔️3.13
️✔️appconfig
️✔️latest
️✔️3.12
️✔️3.13
️✔️appservice
️✔️latest
️✔️3.12
️✔️3.13
️✔️aro
️✔️latest
️✔️3.12
️✔️3.13
️✔️backup
️✔️latest
️✔️3.12
️✔️3.13
️✔️batch
️✔️latest
️✔️3.12
️✔️3.13
️✔️batchai
️✔️latest
️✔️3.12
️✔️3.13
️✔️billing
️✔️latest
️✔️3.12
️✔️3.13
️✔️botservice
️✔️latest
️✔️3.12
️✔️3.13
️✔️cdn
️✔️latest
️✔️3.12
️✔️3.13
️✔️cloud
️✔️latest
️✔️3.12
️✔️3.13
️✔️cognitiveservices
️✔️latest
️✔️3.12
️✔️3.13
️✔️compute_recommender
️✔️latest
️✔️3.12
️✔️3.13
️✔️computefleet
️✔️latest
️✔️3.12
️✔️3.13
️✔️config
️✔️latest
️✔️3.12
️✔️3.13
️✔️configure
️✔️latest
️✔️3.12
️✔️3.13
️✔️consumption
️✔️latest
️✔️3.12
️✔️3.13
️✔️container
️✔️latest
️✔️3.12
️✔️3.13
️✔️containerapp
️✔️latest
️✔️3.12
️✔️3.13
️✔️core
️✔️latest
️✔️3.12
️✔️3.13
️✔️cosmosdb
️✔️latest
️✔️3.12
️✔️3.13
️✔️databoxedge
️✔️latest
️✔️3.12
️✔️3.13
️✔️dls
️✔️latest
️✔️3.12
️✔️3.13
️✔️dms
️✔️latest
️✔️3.12
️✔️3.13
️✔️eventgrid
️✔️latest
️✔️3.12
️✔️3.13
️✔️eventhubs
️✔️latest
️✔️3.12
️✔️3.13
️✔️feedback
️✔️latest
️✔️3.12
️✔️3.13
️✔️find
️✔️latest
️✔️3.12
️✔️3.13
️✔️hdinsight
️✔️latest
️✔️3.12
️✔️3.13
️✔️identity
️✔️latest
️✔️3.12
️✔️3.13
️✔️iot
️✔️latest
️✔️3.12
️✔️3.13
️✔️keyvault
️✔️latest
️✔️3.12
️✔️3.13
️✔️lab
️✔️latest
️✔️3.12
️✔️3.13
️✔️managedservices
️✔️latest
️✔️3.12
️✔️3.13
️✔️maps
️✔️latest
️✔️3.12
️✔️3.13
️✔️marketplaceordering
️✔️latest
️✔️3.12
️✔️3.13
️✔️monitor
️✔️latest
️✔️3.12
️✔️3.13
️✔️mysql
️✔️latest
️✔️3.12
️✔️3.13
️✔️netappfiles
️✔️latest
️✔️3.12
️✔️3.13
️✔️network
️✔️latest
️✔️3.12
️✔️3.13
️✔️policyinsights
️✔️latest
️✔️3.12
️✔️3.13
️✔️privatedns
️✔️latest
️✔️3.12
️✔️3.13
️✔️profile
️✔️latest
️✔️3.12
️✔️3.13
️✔️rdbms
️✔️latest
️✔️3.12
️✔️3.13
️✔️redis
️✔️latest
️✔️3.12
️✔️3.13
️✔️relay
️✔️latest
️✔️3.12
️✔️3.13
️✔️resource
️✔️latest
️✔️3.12
️✔️3.13
️✔️role
️✔️latest
️✔️3.12
️✔️3.13
️✔️search
️✔️latest
️✔️3.12
️✔️3.13
️✔️security
️✔️latest
️✔️3.12
️✔️3.13
️✔️servicebus
️✔️latest
️✔️3.12
️✔️3.13
️✔️serviceconnector
️✔️latest
️✔️3.12
️✔️3.13
️✔️servicefabric
️✔️latest
️✔️3.12
️✔️3.13
️✔️signalr
️✔️latest
️✔️3.12
️✔️3.13
️✔️sql
️✔️latest
️✔️3.12
️✔️3.13
️✔️sqlvm
️✔️latest
️✔️3.12
️✔️3.13
️✔️storage
️✔️latest
️✔️3.12
️✔️3.13
️✔️synapse
️✔️latest
️✔️3.12
️✔️3.13
️✔️telemetry
️✔️latest
️✔️3.12
️✔️3.13
️✔️util
️✔️latest
️✔️3.12
️✔️3.13
️✔️vm
️✔️latest
️✔️3.12
️✔️3.13

@azure-client-tools-bot-prd
Copy link

azure-client-tools-bot-prd bot commented Aug 27, 2025

️✔️AzureCLI-BreakingChangeTest
️✔️Non Breaking Changes

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates the SBOM (Software Bill of Materials) task conditions in the Azure DevOps pipeline to support IndividualCI builds in addition to BatchedCI builds. The change addresses failures in recent pull requests where the SBOM task was running inappropriately in non-customer-facing builds.

  • Replaces single equality condition checks with multi-value condition checks for SBOM tasks
  • Adds IndividualCI trigger support for official CLI release builds
  • Maintains existing BatchedCI support while expanding to IndividualCI scenarios

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@yonzhan
Copy link
Collaborator

yonzhan commented Aug 27, 2025

Thank you for your contribution! We will review the pull request and get back to you soon.

@github-actions
Copy link

The git hooks are available for azure-cli and azure-cli-extensions repos. They could help you run required checks before creating the PR.

Please sync the latest code with latest dev branch (for azure-cli) or main branch (for azure-cli-extensions).
After that please run the following commands to enable git hooks:

pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>

@bebound
Copy link
Contributor

bebound commented Aug 27, 2025

condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release') is the only custome-facing build.

@jiasli
Copy link
Member

jiasli commented Aug 27, 2025

Will enabling SBOM break our batched CI now?

@wangzelin007
Copy link
Member Author

Will enabling SBOM break our batched CI now?
Enabling SBOM will only break our pull request CI.

@wangzelin007 wangzelin007 changed the title {CI} Update SBOM task conditions to support IndividualCI builds {CI} Update SBOM task conditions to trigger on release branches only Aug 27, 2025
displayName: 'SBOM'
condition: eq(variables['Build.Reason'], 'BatchedCI')
continueOnError: true
condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition aligns with the one added by #30554.

@wangzelin007 wangzelin007 merged commit 008f1c2 into Azure:dev Sep 1, 2025
48 checks passed
jiasli pushed a commit to jiasli/azure-cli that referenced this pull request Sep 1, 2025
jiasli pushed a commit to jiasli/azure-cli that referenced this pull request Sep 1, 2025
@jiasli jiasli mentioned this pull request Sep 4, 2025
29 tasks
jiasli added a commit that referenced this pull request Sep 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Auto-Assign Auto assign by bot CI CI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants