Skip to content

[release/13.2] Pin Kusto emulator image and backport Cosmos fix#15504

Merged
mitchdenny merged 3 commits intomicrosoft:release/13.2from
sebastienros:sebros/backport-15473-r132
Mar 24, 2026
Merged

[release/13.2] Pin Kusto emulator image and backport Cosmos fix#15504
mitchdenny merged 3 commits intomicrosoft:release/13.2from
sebastienros:sebros/backport-15473-r132

Conversation

@sebastienros
Copy link
Contributor

@sebastienros sebastienros commented Mar 23, 2026

Description

Updates the release/13.2 backport branch to keep the Kusto functional tests enabled, revert the Kusto log-assertion tightening, and pin the Kusto emulator image to 2026.03.16.1116-2611-994a3c9-master.

This PR now includes:

  • the Cosmos DB emulator image default change already backported on this branch
  • a release-branch test expectation update for the Cosmos default tag
  • a pinned Kusto emulator default image tag
  • a matching Kusto unit test expectation update
  • a revert of the Kusto functional test assertion changes so the tests stay enabled without the broader log-assertion rewrite

Validation:

  • ./dotnet.sh test tests/Aspire.Hosting.Azure.Kusto.Tests/Aspire.Hosting.Azure.Kusto.Tests.csproj -- --filter-method "*.RunAsEmulator_ShouldConfigureContainerImageWithCorrectTag" --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"
  • ./dotnet.sh test tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj -- --filter-method "*.AddAzureCosmosDBWithEmulatorGetsExpectedImageTag" --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"
  • attempted KustoFunctionalTests locally after the image pin; the class still failed in this environment

Fixes # (issue)

Checklist

  • Is this feature complete?
    • Yes. Ready to ship.
    • No. Follow-up changes expected.
  • Are you including unit tests for the changes and scenario tests if relevant?
    • Yes
    • No
  • Did you add public API?
    • Yes
      • If yes, did you have an API Review for it?
        • Yes
        • No
      • Did you add <remarks /> and <code /> elements on your triple slash comments?
        • Yes
        • No
    • No
  • Does the change make any security assumptions or guarantees?
    • Yes
      • If yes, have you done a threat model and had a security review?
        • Yes
        • No
    • No
  • Does the change require an update in our Aspire docs?

sebastienros and others added 2 commits March 23, 2026 14:06
* Tighten Kusto functional log assertions

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Document Kusto log assertion source

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Assert Kusto failure log message

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Fix Kusto assertion analyzer warning

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Re-enable Kusto Linux tests

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Relax Kusto invalid log assertion

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Strengthen Kusto failure log assertions

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Relax Kusto exception assertion

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Reduce Cosmos emulator test footprint

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Scope Cosmos wait test health checks

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Harden Cosmos emulator readiness

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Pin classic Cosmos emulator image

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Use Cosmos emulator 2.14.26

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Use stable Cosmos emulator image

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit 75c45a3)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings March 23, 2026 21:15
@github-actions
Copy link
Contributor

github-actions bot commented Mar 23, 2026

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 15504

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 15504"

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

Backports test/emulator stabilization fixes for Azure Kusto and Cosmos DB onto release/13.2, aligning behavior with main (per #15473) to reduce flaky assertions and lock Cosmos emulator to a non-moving default tag.

Changes:

  • Kusto functional tests: narrow log assertions to only database-creation failure logs (instead of all warning/error resource logs).
  • Cosmos DB: change the default Linux emulator container image tag from latest to stable.
  • Update Cosmos unit test expectation for the default tag behavior (per intent in PR description).

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
tests/Aspire.Hosting.Azure.Tests/AzureCosmosDBExtensionsTests.cs Updates expected Cosmos emulator tag string used in assertion.
tests/Aspire.Hosting.Azure.Kusto.Tests/KustoFunctionalTests.cs Narrows log assertions to specific “Failed to create database” error signal.
src/Aspire.Hosting.Azure.CosmosDB/CosmosDBEmulatorContainerImageTags.cs Switches default Cosmos emulator image tag constant to stable.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@sebastienros sebastienros changed the title [release/13.2] Backport Kusto and Cosmos fixes from #15473 [release/13.2] Pin Kusto emulator image and backport Cosmos fix Mar 23, 2026
@sebastienros sebastienros requested review from adamint March 23, 2026 22:31
@sebastienros sebastienros assigned radical and unassigned radical Mar 23, 2026
@sebastienros sebastienros requested review from radical March 23, 2026 22:31
@mitchdenny
Copy link
Member

/quarantine-test Aspire.Cli.EndToEnd.Tests.DockerDeploymentTests.CreateAndDeployToDockerCompose Aspire.Cli.EndToEnd.Tests.KubernetesPublishTests.CreateAndPublishToKubernetes #15511 --target-pr #15504

@github-actions
Copy link
Contributor

@mitchdenny ❌ Quarantine failed.

Error: PR #15504 is from a fork or the source repository was deleted. Cannot push to fork branches.

See the workflow run for full details.

@mitchdenny
Copy link
Member

Merging after 15511 went in.

@mitchdenny mitchdenny merged commit 9134219 into microsoft:release/13.2 Mar 24, 2026
497 of 506 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants