[6.1.5 Cherry-pick] Add SQL Server readiness checks to Windows pipeline setup (#4172)#4186
Merged
paulmedynski merged 4 commits intorelease/6.1from Apr 14, 2026
Merged
Conversation
To resolve, run: git cherry-pick 8ddc464
Manually apply the password-related changes from commit e94bb69 (Fix forked repo local SQL Server passwords (#3950)) to the release/6.1 branch. The full cherry-pick conflicted across 12+ files due to divergence, so only the saPassword pipeline plumbing was ported: - Add generate-secrets-ci-stage.yml to produce a random SA password - Replace per-job password generation with stage-level saPassword variable - Thread saPassword through ci-run-tests-stage, ci-run-tests-job, configure-sql-server-step, and update-config-file-step - Update stress-tests-ci-stage/job to pass saPassword via step objects - Fix System.PullRequest.IsFork casing in dotnet-sqlclient-ci-core.yml - Remove isFork guard from enclave AADServicePrincipalSecret
paulmedynski
changed the title
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
apoorvdeshmukh
approved these changes
Apr 14, 2026
paulmedynski
approved these changes
Apr 14, 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
2 participants
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.
Cherry-pick of #4172 to
release/6.1This PR ports the SQL Server readiness checks from #4172 to the
release/6.1branch for the 6.1.5 release.Why this was not a straightforward cherry-pick
Commit
8ddc464d8(#4172) could not be cherry-picked directly becauseconfigure-sql-server-win-step.ymlhad diverged significantly betweenmainandrelease/6.1. Three intermediate commits onmainchanged this file before #4172:Write-Hostdiagnosticspasswordparameter withsaPassword, removed theconditionparameter, addedgenerate-secrets-ci-stage.yml, and threadedsaPasswordthrough the entire pipelineEach of those commits touched many other pipeline files that also diverged, making full cherry-picks impractical (8-12 file conflicts each).
Resolution approach
Port
saPasswordplumbing from Fix forked repo local SQL Server passwords #3950 — Manually applied the secret generation and password threading changes across 9 files:eng/pipelines/stages/generate-secrets-ci-stage.yml(new)dotnet-sqlclient-ci-core.yml— secrets stage,additionalDependsOn,IsForkcasing fixesci-run-tests-stage.yml—secrets_stagedependency,saPasswordvariableci-run-tests-job.yml—saPasswordparameter, removed per-job password generationconfigure-sql-server-step.yml—password→saPasswordupdate-config-file-step.yml—saPasswordparameter,$(Password)setter stepstress-tests-ci-stage.yml—secrets_stagedependency, step-typesqlSetupStepstress-tests-ci-job.yml—sqlSetupStepchanged fromstringtosteptyperun-tests-package-reference-job.yml— passessaPasswordto config stepAlign
configure-sql-server-win-step.yml— Replaced the file contents with the state frommainjust prior to Add SQL Server readiness checks to Windows pipeline setup #4172 (commite94bb69a1), incorporating the formatting, indentation, and parameter changes from Stabilize macOS agent setup #3928, Fix SupportsIntegratedSecurity Test Configuration #3887, and Fix forked repo local SQL Server passwords #3950.Clean cherry-pick of Add SQL Server readiness checks to Windows pipeline setup #4172 — Applied without conflicts, adding the FileStream retry loop and post-restart SQL Server readiness polling.
Commits
09645f0830b8a1474d73ecafad8b3c3d5a04Checklist
saPasswordcorrectly