Skip to content

Feat: devcontainer pytest integration#110

Open
junkataoka wants to merge 3 commits intomainfrom
feature/devcontainer-pytest-integration
Open

Feat: devcontainer pytest integration#110
junkataoka wants to merge 3 commits intomainfrom
feature/devcontainer-pytest-integration

Conversation

@junkataoka
Copy link
Copy Markdown

@junkataoka junkataoka commented Dec 16, 2025

This pull request introduces a major refactor and modernization of the CI pipeline infrastructure for both Azure DevOps and GitHub Actions. The main improvements are the switch to modular, template-driven pipeline definitions, enhanced support for devcontainer-based testing, and improved code coverage reporting. The changes streamline CI setup, make it easier to add new projects, and improve compatibility across platforms (Linux and macOS). Documentation and configuration files have also been updated for clarity and consistency.

Azure DevOps Pipeline Modernization

  • Both .azuredevops/ado-ci-pipeline-ms-hosted.yml and .azuredevops/ado-ci-pipeline-self-hosted.yml are refactored to use a two-stage pipeline (Lint and Test), with jobs and steps defined via new templates for devcontainer testing and coverage publishing. This replaces legacy scripts and direct task definitions, making the pipeline more maintainable and extensible. [1] [2] [3]

Template-Driven CI Architecture

  • New reusable templates are introduced under .azuredevops/templates/, including test-devcontainer-job.yml for per-project devcontainer testing, run-devcontainer.yml for platform-aware container execution, setup-devcontainer.yml for environment setup, publish-test-results.yml for publishing test results and coverage, and merge-coverage.yml for merging and publishing code coverage reports. [1] [2] [3] [4] [5]

GitHub Actions Pipeline Improvements

  • .github/workflows/ci.yaml is reworked to use matrix jobs for devcontainer-based testing, artifact upload for results and coverage, and a dedicated lint job. A new job aggregates and publishes combined test results and coverage reports, improving visibility and maintainability. [1] [2]

Documentation and Configuration Updates

  • References to legacy scripts (e.g., ci-tests.sh) are removed from README.md and .env.example is updated for clarity, reflecting the new devcontainer and pipeline workflow. [1] [2] [3]

Platform Compatibility and Usability Enhancements

  • The new pipeline templates include logic for handling both Linux and macOS (Apple Silicon) agents, and ensure clean workspace setup and artifact handling for reliable CI runs. [1] [2]

Does this introduce a breaking change?

  • Yes
  • No

Author pre-publish checklist

  • No PII in logs or output
  • Made corresponding changes to the documentation
  • All new packages used are included in requirements.txt
  • Functions use type hints, and there are no type hint errors

Pull Request Type

What kind of change does this Pull Request introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Documentation content changes
  • Experiment notebook

@junkataoka
Copy link
Copy Markdown
Author

@junkataoka please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

@microsoft-github-policy-service agree [company="microsoft"]

@junkataoka junkataoka force-pushed the feature/devcontainer-pytest-integration branch from 44faaca to ec09cba Compare December 16, 2025 08:43
@junkataoka
Copy link
Copy Markdown
Author

@microsoft-github-policy-service agree
@microsoft-github-policy-service agree company="Microsoft"

@junkataoka junkataoka force-pushed the feature/devcontainer-pytest-integration branch 5 times, most recently from 2523a23 to 0ebed45 Compare December 18, 2025 15:06
@junkataoka junkataoka changed the title Feature/devcontainer pytest integration feat: devcontainer pytest integration Dec 18, 2025
@junkataoka junkataoka changed the title feat: devcontainer pytest integration Feat: devcontainer pytest integration Dec 18, 2025
@junkataoka junkataoka force-pushed the feature/devcontainer-pytest-integration branch from d73bb8e to 82fb7b9 Compare December 19, 2025 00:10
@junkataoka junkataoka requested a review from Copilot December 19, 2025 00:20

This comment was marked as outdated.

This comment was marked as outdated.

@junkataoka junkataoka force-pushed the feature/devcontainer-pytest-integration branch 3 times, most recently from f22f8ef to d94a2d6 Compare December 19, 2025 02:55
- Add GitHub Actions workflow using official devcontainers/ci@v0.3 action
- Add Azure DevOps pipeline with custom templates for macOS compatibility
- Configure pytest with coverage reporting and JUnit XML output
- Handle workspace permission issues using /tmp with sudo
- Support CPU, GPU, and notebooks project configurations
- Add coverage merging and test result publishing for both platforms
- Skip pre-commit hook installation in CI when .git not available
- Add sync-to-azdo workflow for pipeline synchronization
- Update documentation with CI/CD setup instructions

GitHub Actions uses the official action which works well on Linux.
Azure DevOps uses custom templates to handle macOS-specific Docker issues
(path translation and working directory mount namespace errors).
@junkataoka junkataoka force-pushed the feature/devcontainer-pytest-integration branch from 672b9c6 to 164e6b9 Compare December 19, 2025 04:51
Copy link
Copy Markdown
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

Copilot reviewed 15 out of 16 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread pyproject.toml
Comment thread .github/workflows/ci.yaml Outdated
@junkataoka junkataoka marked this pull request as ready for review December 19, 2025 05:21
@junkataoka junkataoka requested a review from bhavikm December 19, 2025 05:21
Comment thread src/sample_cpu_project/.devcontainer/devcontainer.json Outdated
Comment on lines +78 to +81
}
},
}
}
},
}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this your vscode's setting? it'd be good to keep diff minimal as this PR is quite large and format change may not be worth including?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted here as well — trailing commas restored to match the original style.

"workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/repo,type=bind",
"workspaceFolder": "/workspaces/repo",
"remoteUser": "devuser",
"postCreateCommand": "cd /workspaces/repo && pre-commit install --overwrite || echo 'pre-commit installation failed; continuing without pre-commit hooks'",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there any benefit of still going ahead when pre-commit fails? I'd rather it fail there as something would be wrong in that case

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed — removed the || echo fallback so pre-commit failures are surfaced properly instead of being silently swallowed.

Comment thread src/sample_pytorch_gpu_project/.devcontainer/devcontainer.json Outdated
Comment thread notebooks/.devcontainer/devcontainer.json Outdated
Comment thread notebooks/.devcontainer/devcontainer.json Outdated
Comment thread notebooks/.devcontainer/devcontainer.json Outdated
Comment thread src/sample_cpu_project/.devcontainer/devcontainer.json Outdated
Comment thread src/sample_cpu_project/.devcontainer/devcontainer.json Outdated
Comment thread src/sample_pytorch_gpu_project/.devcontainer/devcontainer.json Outdated
Comment thread notebooks/.devcontainer/devcontainer.json Outdated
Comment thread src/sample_pytorch_gpu_project/.devcontainer/devcontainer.json
Comment thread src/sample_pytorch_gpu_project/.devcontainer/devcontainer.json Outdated
Comment thread .azuredevops/ado-ci-pipeline-ms-hosted.yml
Comment thread .azuredevops/ado-ci-pipeline-ms-hosted.yml Outdated
# but could be adapated to other OSs.

# Azure DevOps CI Pipeline (Self-Hosted Agent)
#
Copy link
Copy Markdown
Member

@fujikosu fujikosu Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this 10GB part was the reason why we needed two different yamls. Could you check if it's ok to delete this part? If we still have this restriction, we likely need some cleanup method we had for self-hosted version specifically

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch — restored the 10GB context comment. This is the key reason the self-hosted pipeline exists, so it's important to keep that documented.

Comment thread .github/workflows/ci.yaml Outdated
- name: Checkout code
uses: actions/checkout@v6
- name: Checkout repository
uses: actions/checkout@v4
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why does this degrade version?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed — upgraded action versions to match main branch: checkout@v6, setup-python@v6, upload-artifact@v7. The downgrades were unintentional.

Comment thread .github/workflows/ci.yaml Outdated
Comment thread .github/workflows/ci.yaml Outdated
filename: 'coverage/**/*.xml'

- name: Add code coverage summary markdown to github step summary
- name: Add code coverage summary to job summary
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is not accurate?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted the step name back to the original: "Add code coverage summary markdown to github step summary".

Comment thread .github/workflows/ci.yaml Outdated
Comment thread .github/workflows/ci.yaml
@@ -13,44 +13,109 @@ permissions:
contents: read
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it's really worth splitting into several jobs instead of having having them as multiple steps based on job complextity we have. One thing I noticed is this does repo clone 4 times as it used to be just one for example and that's one of downsides of going with this structure

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed — consolidated everything back into a single build job to avoid multiple repo clones. Lint runs first as steps, followed by sequential devcontainer tests (cpu, gpu, notebooks), then publish results. Keeps the structure simple while using the new devcontainer-based testing approach.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. This simple structure looks better. Should we follow the same approach on AzDO side and remove templates and revert back to the original approach while updating test step only to keep the update simple?

Copy link
Copy Markdown
Member

@fujikosu fujikosu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR! I left several comments so please check them

- Remove .github/agents/ .github/prompts/ and speckit entries from .gitignore
- Restore PYTHONPATH in .env.example
- Remove containerEnv (PYTHONPATH via .env auto-loads)
- Remove redundant remoteUser (set by Dockerfile USER)
- Remove pre-commit failure suppression (|| echo)
- Restore trailing commas in JSONC files

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@junkataoka junkataoka force-pushed the feature/devcontainer-pytest-integration branch from ce25229 to f0d0c2c Compare March 31, 2026 00:34
@junkataoka
Copy link
Copy Markdown
Author

junkataoka commented Mar 31, 2026

@fujikosu Thank you for the thorough review! I've addressed all the comments — really appreciate you taking the time to go through everything in detail. The feedback helped improve the PR significantly.

@junkataoka junkataoka requested a review from fujikosu March 31, 2026 02:22
Comment thread .github/workflows/ci.yaml
name: pytest
path: |
**/test-results-*.xml
path: 'test-results-*.xml'
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this path udpate for?

Comment thread .github/workflows/ci.yaml
output: both
format: markdown
filename: coverage.xml
filename: 'coverage-*.xml'
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this filename update for?

Comment thread .github/workflows/ci.yaml
Comment on lines +118 to +119
test-results-*.xml
coverage-*.xml
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what are these path update for?

Copy link
Copy Markdown
Member

@fujikosu fujikosu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the update! I added comments to your update

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.

3 participants