{Branch Management} Fix merge-base: Merge release 2.86.0 back to dev#33283
Merged
naga-nandyala merged 1 commit intodevfrom Apr 29, 2026
Merged
{Branch Management} Fix merge-base: Merge release 2.86.0 back to dev#33283naga-nandyala merged 1 commit intodevfrom
naga-nandyala merged 1 commit intodevfrom
Conversation
wangzelin007
requested review from
YanaXu,
bebound,
jiasli,
naga-nandyala and
yonzhan
as code owners
️✔️AzureCLI-FullTest
|
️✔️AzureCLI-BreakingChangeTest
|
Collaborator
|
Thank you for your contribution! We will review the pull request and get back to you soon. |
|
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). pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>
|
microsoft-github-policy-service
Bot
requested review from
jsntcy and
zhoxing-ms
microsoft-github-policy-service
Bot
added
Batch
Contributor
There was a problem hiding this comment.
Pull request overview
This PR syncs the CredScan false-positive suppression added on release (for 2.86.0) back into dev, restoring a clean merge-base and preventing future dev credential scans from failing on the same unit-test dummy value.
Changes:
- Add a new CredScan suppression placeholder (
mypass) justified as a dummyDOCKER_REGISTRY_SERVER_PASSWORDused in AppService unit tests.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
naga-nandyala
approved these changes
Apr 29, 2026
necusjz
approved these changes
Apr 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix merge-base between
releaseanddevPR #33279 (
{CI} Add suppression for dummy DOCKER_REGISTRY_SERVER_PASSWORD in unit tests) was merged torelease(commit0c93c90f04) to fix the Batch CI Credential Scanner failure during the 2.86.0 release.This PR brings that fix from
releaseback todevso future scans ondevdon't hit the same false positive.Current state (before this PR)
upstream/releaseHEAD0c93c90f04(#33279 merged here)upstream/devHEADc81b61793bWhat this PR does
This PR exists to satisfy the
azure-production-rulesetPR requirement. It will be merged locally usinggit merge --no-ffand pushed, creating a 2-parent merge commit that linksreleasehistory intodevand advances the merge-base.How to merge
🛑 Do NOT use the GitHub UI merge button or GitHub CLI
gh pr merge.Follow the documented hotfix process:
git checkout dev && git pull origin dev && git merge origin/release --no-ff -m "Merge release 2.86.0 back to dev"git push origin devFile changes
Only 1 file changed:
scripts/ci/credscan/CredScanSuppressions.json(4 additions) — the credscan false positive fix from PR #33279.Reference
Same process as PR #32924 (
{Branch Management} Fix merge-base: Merge release 2.84.0 back to dev).