Skip to content

Conversation

Copilot
Copy link
Contributor

@Copilot Copilot AI commented Oct 3, 2025

Merge PR #22576 with Latest Main - COMPLETED ✅

This PR successfully recreates all changes from PR #22576 (feat(ci): Add e2e tests against latest docker images) merged with the latest main branch.

Original PR Information

Changes Successfully Applied

  • ✅ Update server/docker-compose.yml - Add nginx proxy, update image tags, change ports to expose
  • ✅ Update server/routerlicious/docker-compose.yml - Add platform spec, update image tags to use variables
  • ✅ Update server/routerlicious/packages/routerlicious/config/config.json - Enable whole summary upload
  • ✅ Update tools/pipelines/templates/include-test-real-service.yml - Add preSteps and checkout parameters
  • ✅ Update tools/pipelines/test-real-service.yml - Add new e2e docker test stage with server pipeline resources
  • ✅ Address PR feedback - Remove volume mounts, fix checkout logic, add FLUID_LOGGER_PROPS
  • ✅ Simplify pipeline checkout logic - Eliminate ffPipelineHostPath variable

Summary

All changes from PR #22576 have been successfully applied to the latest main branch (commit 46e6dce). The changes add:

  • New nginx proxy configuration for docker environment
  • Split image tags for historian, gitrest, and gitssh
  • Enabled whole summary upload by default in docker config
  • New CI pipeline stage for e2e tests against docker with server pipeline resource dependencies
  • Simplified template with consistent directory structure (ff_pipeline_host at root, FluidFramework in subdirectory when needed)

Statistics: 5 files changed, 117 additions(+), 20 deletions(-)

Original prompt

Take the contents of @microsoft/FluidFramework/pull/22576 and merge the latest main, then open a fresh PR.


💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.

This recreates changes from PR #22576 merged with latest main branch.

Changes include:
- Add nginx proxy to server/docker-compose.yml
- Split image tags for gitrest and gitssh from historian
- Enable whole summary upload in routerlicious config
- Add preSteps and checkout parameters to pipeline template
- Add new e2e docker test stage with server pipeline resources

Co-authored-by: tylerbutler <[email protected]>
@Copilot Copilot AI changed the title [WIP] Take the contents of @microsoft/FluidFramework/pull/22576 and merge the latest main, then open a fresh PR. feat(ci): Add e2e tests against latest docker images Oct 3, 2025
@Copilot Copilot AI requested a review from tylerbutler October 3, 2025 17:24
Copilot finished work on behalf of tylerbutler October 3, 2025 17:24
@github-actions github-actions bot added area: build Build related issues area: server Server related issues (routerlicious) base: main PRs targeted against main branch labels Oct 3, 2025
@tylerbutler
Copy link
Member

/azp run Build - protocol-definitions,Build - test-tools,server-gitrest,server-gitssh,server-historian,server-routerlicious,Build - client packages,repo-policy-check

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@tylerbutler
Copy link
Member

/azp run Build - api-markdown-documenter,Build - benchmark-tool,Build - build-common,Build - build-tools,Build - common-utils,Build - eslint-config-fluid,Build - eslint-plugin-fluid

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@tylerbutler
Copy link
Member

@copilot Address the PR feedback.

- Remove volume mount for config.json in alfred (was for local testing only)
- Remove commented-out volume mount in historian
- Update checkout logic to always checkout ff_pipeline_host, then optionally checkout self
- Clean up comment about containerRegistryConnection
- Add FLUID_LOGGER_PROPS to e2e_docker stage env

Co-authored-by: tylerbutler <[email protected]>
@Copilot Copilot AI requested a review from tylerbutler October 6, 2025 05:41
Copilot finished work on behalf of tylerbutler October 6, 2025 05:41
@tylerbutler
Copy link
Member

@copilot simplify the pipeline by always leaving ff_pipeline_host at the root ($(Build.SourcesDirectory)) and only checking out the FluidFramework repo as a subdirectory when needed. This would allow you to reference $(Build.SourcesDirectory) directly for all test host actions and use a sourcePath variable only when you need files from the FluidFramework repo (like the docker-compose.yml file), eliminating the need for ffPipelineHostPath and improving maintainability.

- ff_pipeline_host now always stays at Build.SourcesDirectory root
- FluidFramework repo checks out to subdirectory (FluidFramework/) when needed
- Eliminated ffPipelineHostPath variable - all paths now use Build.SourcesDirectory directly
- Improved maintainability by having a consistent root directory

Co-authored-by: tylerbutler <[email protected]>
Copy link
Contributor Author

Copilot AI commented Oct 7, 2025

@copilot simplify the pipeline by always leaving ff_pipeline_host at the root ($(Build.SourcesDirectory)) and only checking out the FluidFramework repo as a subdirectory when needed. This would allow ...

Simplified the pipeline checkout logic. Now ff_pipeline_host always stays at $(Build.SourcesDirectory) root, and FluidFramework checks out to a subdirectory (FluidFramework/) when needed via the checkout parameter. Eliminated the ffPipelineHostPath variable entirely - all paths now reference $(Build.SourcesDirectory) directly. This improves maintainability and consistency. Commit: bb2b53d

Copilot finished work on behalf of tylerbutler October 7, 2025 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: build Build related issues area: server Server related issues (routerlicious) base: main PRs targeted against main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants