Skip to content

Unify non-Azure CLI E2E helpers and stabilize localhive#16131

Draft
davidfowl wants to merge 11 commits intomainfrom
davidfowl/unify-e2e-helpers
Draft

Unify non-Azure CLI E2E helpers and stabilize localhive#16131
davidfowl wants to merge 11 commits intomainfrom
davidfowl/unify-e2e-helpers

Conversation

@davidfowl
Copy link
Copy Markdown
Contributor

@davidfowl davidfowl commented Apr 13, 2026

Description

This draft consolidates the non-Azure CLI E2E helper migration with the localhive reliability fixes that fell out of validating real bundle-backed scenarios.

  • Unifies the non-Azure Docker, Kubernetes, JavaScript publish, and Podman CLI E2E suites around CliInstallStrategy and the shared terminal/install helpers.
  • Runs the Podman deployment scenario inside a privileged Docker helper container so the test no longer depends on host Podman state.
  • Fixes localhive template installation from flat local sources by resolving the exact local .nupkg path, improves process output draining with an idle-based forwarder wait, and filters AppleDouble ._* package artifacts from localhive archives on macOS.
  • Preserves the improved failure diagnostics for local and CI runs by capturing Aspire logs and workspace artifacts into preserved workspaces without changing product socket-path behavior.

Validation:

  • dotnet test tests/Aspire.Cli.Tests/Aspire.Cli.Tests.csproj -- --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"
  • dotnet test tests/Aspire.Cli.Tests/Aspire.Cli.Tests.csproj -- --filter-method "*.WaitForExitAsync_AllowsForwardersToDrainBeforeClosingStreams" --filter-method "*.SdkDumpCi_ForHostingProject_DoesNotEmitWarnings" --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"
  • ASPIRE_E2E_ARCHIVE=/tmp/aspire-stop-arm64-695e.tar.gz dotnet test tests/Aspire.Cli.EndToEnd.Tests/Aspire.Cli.EndToEnd.Tests.csproj -- --filter-method "*.DeployK8sBasicApiService" --filter-method "*.DeployTypeScriptAppToKubernetes" --filter-method "*.CreateAndDeployToDockerComposeWithPodman" --filter-not-trait "quarantined=true"

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?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 13, 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 -- 16131

Or

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

davidfowl and others added 2 commits April 13, 2026 18:28
Convert all 35 remaining test files from DockerInstallMode to
CliInstallStrategy. Remove SourceBuild-specific logic (local channel
setup, bundle mounting, channel arguments) from TypeScriptPolyglotTests
and TypeScriptSqlServerNativeAssetsBundleTests — LocalHive handles
all of this via the archive.

Verified locally: SmokeTests, TypeScriptStarterTemplate, and
StartStopTests all pass with LocalHive mode.

Fixes #16032 (partial)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@eerhardt
Copy link
Copy Markdown
Member

Let's make sure the deployment end to end tests don't regress. Right now we are down to 4 failing tests. 3 I hope will be fixed by #16125 and AcaCompactNamingUpgradeDeploymentTests, which I don't know why fails yet.

image

@davidfowl davidfowl force-pushed the davidfowl/unify-e2e-helpers branch from 8d78862 to 887df3f Compare April 14, 2026 01:30
Drop the unrelated ReplaceText project swap from this PR and keep the existing script-based template version rewrite.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
davidfowl and others added 2 commits April 13, 2026 18:40
Use a shared socket-directory creation helper and switch the default short-path fallback to the platform temp root instead of hardcoding /tmp.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Keep the localhive and diagnostics improvements, but stop changing product socket path behavior. The E2E helpers now capture ~/.aspire artifacts into preserved workspaces instead of rewriting HOME.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@davidfowl davidfowl changed the title Unify CLI E2E install strategy and stabilize localhive Unify CLI E2E helpers and stabilize localhive Apr 14, 2026
davidfowl and others added 4 commits April 13, 2026 21:00
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Migrate the non-Azure publish and deployment CLI E2E suites onto the shared install helpers and add a Podman-in-Docker helper image so Podman deploy validation no longer depends on host Podman state.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@davidfowl davidfowl changed the title Unify CLI E2E helpers and stabilize localhive Unify non-Azure CLI E2E helpers and stabilize localhive Apr 14, 2026
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

🎬 CLI E2E Test Recordings — 71 recordings uploaded (commit 52669a7)

View recordings
Test Recording
AddPackageInteractiveWhileAppHostRunningDetached ▶️ View Recording
AddPackageWhileAppHostRunningDetached ▶️ View Recording
AgentCommands_AllHelpOutputs_AreCorrect ▶️ View Recording
AgentInitCommand_DefaultSelection_InstallsSkillOnly ▶️ View Recording
AgentInitCommand_MigratesDeprecatedConfig ▶️ View Recording
AllPublishMethodsBuildDockerImages ▶️ View Recording
AspireAddPackageVersionToDirectoryPackagesProps ▶️ View Recording
AspireUpdateRemovesAppHostPackageVersionFromDirectoryPackagesProps ▶️ View Recording
Banner_DisplayedOnFirstRun ▶️ View Recording
Banner_DisplayedWithExplicitFlag ▶️ View Recording
Banner_NotDisplayedWithNoLogoFlag ▶️ View Recording
CertificatesClean_RemovesCertificates ▶️ View Recording
CertificatesTrust_WithNoCert_CreatesAndTrustsCertificate ▶️ View Recording
CertificatesTrust_WithUntrustedCert_TrustsCertificate ▶️ View Recording
ConfigSetGet_CreatesNestedJsonFormat ▶️ View Recording
CreateAndRunAspireStarterProject ▶️ View Recording
CreateAndRunAspireStarterProjectWithBundle ▶️ View Recording
CreateAndRunEmptyAppHostProject ▶️ View Recording
CreateAndRunJavaEmptyAppHostProject ▶️ View Recording
CreateAndRunJsReactProject ▶️ View Recording
CreateAndRunPythonReactProject ▶️ View Recording
CreateAndRunTypeScriptEmptyAppHostProject ▶️ View Recording
CreateAndRunTypeScriptStarterProject ▶️ View Recording
CreateJavaAppHostWithViteApp ▶️ View Recording
CreateStartAndStopAspireProject ▶️ View Recording
CreateTypeScriptAppHostWithViteApp ▶️ View Recording
DashboardRunWithOtelTracesReturnsNoTraces ▶️ View Recording
DeployK8sBasicApiService ▶️ View Recording
DeployK8sWithGarnet ▶️ View Recording
DeployK8sWithMongoDB ▶️ View Recording
DeployK8sWithMySql ▶️ View Recording
DeployK8sWithPostgres ▶️ View Recording
DeployK8sWithRabbitMQ ▶️ View Recording
DeployK8sWithRedis ▶️ View Recording
DeployK8sWithSqlServer ▶️ View Recording
DeployK8sWithValkey ▶️ View Recording
DeployTypeScriptAppToKubernetes ▶️ View Recording
DescribeCommandResolvesReplicaNames ▶️ View Recording
DescribeCommandShowsRunningResources ▶️ View Recording
DetachFormatJsonProducesValidJson ▶️ View Recording
DoListStepsShowsPipelineSteps ▶️ View Recording
DoctorCommand_DetectsDeprecatedAgentConfig ▶️ View Recording
DoctorCommand_WithSslCertDir_ShowsTrusted ▶️ View Recording
DoctorCommand_WithoutSslCertDir_ShowsPartiallyTrusted ▶️ View Recording
GlobalMigration_HandlesCommentsAndTrailingCommas ▶️ View Recording
GlobalMigration_HandlesMalformedLegacyJson ▶️ View Recording
GlobalMigration_PreservesAllValueTypes ▶️ View Recording
GlobalMigration_SkipsWhenNewConfigExists ▶️ View Recording
GlobalSettings_MigratedFromLegacyFormat ▶️ View Recording
InitTypeScriptAppHost_AugmentsExistingViteRepoAtRoot ▶️ View Recording
InvalidAppHostPathWithComments_IsHealedOnRun ▶️ View Recording
LegacySettingsMigration_AdjustsRelativeAppHostPath ▶️ View Recording
LogsCommandShowsResourceLogs ▶️ View Recording
OtelLogsReturnsStructuredLogsFromStarterApp ▶️ View Recording
PsCommandListsRunningAppHost ▶️ View Recording
PsFormatJsonOutputsOnlyJsonToStdout ▶️ View Recording
PublishWithConfigureEnvFileUpdatesEnvOutput ▶️ View Recording
PublishWithDockerComposeServiceCallbackSucceeds ▶️ View Recording
RestoreGeneratesSdkFiles ▶️ View Recording
RestoreSupportsConfigOnlyHelperPackageAndCrossPackageTypes ▶️ View Recording
RunFromParentDirectory_UsesExistingConfigNearAppHost ▶️ View Recording
SecretCrudOnDotNetAppHost ▶️ View Recording
SecretCrudOnTypeScriptAppHost ▶️ View Recording
StagingChannel_ConfigureAndVerifySettings_ThenSwitchChannels ▶️ View Recording
StartAndWaitForTypeScriptSqlServerAppHostWithNativeAssets ▶️ View Recording
StopAllAppHostsFromAppHostDirectory ▶️ View Recording
StopAllAppHostsFromUnrelatedDirectory ▶️ View Recording
StopNonInteractiveMultipleAppHostsShowsError ▶️ View Recording
StopNonInteractiveSingleAppHost ▶️ View Recording
StopWithNoRunningAppHostExitsSuccessfully ▶️ View Recording
UnAwaitedChainsCompileWithAutoResolvePromises ▶️ View Recording

📹 Recordings uploaded automatically from CI run #24404068249

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.

2 participants