Skip to content

Revert "fix: use the mcp user CM for the its tests"#1298

Merged
dbasunag merged 1 commit intomainfrom
revert-1295-mcp_cm
Mar 25, 2026
Merged

Revert "fix: use the mcp user CM for the its tests"#1298
dbasunag merged 1 commit intomainfrom
revert-1295-mcp_cm

Conversation

@fege
Copy link
Copy Markdown
Contributor

@fege fege commented Mar 25, 2026

Reverts #1295

Summary by CodeRabbit

  • Tests
    • Updated test fixtures and constants to align with model catalog naming conventions.
    • Modified test configuration paths to reflect updated directory structure for catalog sources.

@github-actions
Copy link
Copy Markdown

The following are automatically added/executed:

  • PR size label.
  • Run pre-commit
  • Run tox
  • Add PR author as the PR assignee
  • Build image based on the PR

Available user actions:

  • To mark a PR as WIP, add /wip in a comment. To remove it from the PR comment /wip cancel to the PR.
  • To block merging of a PR, add /hold in a comment. To un-block merging of PR comment /hold cancel.
  • To mark a PR as approved, add /lgtm in a comment. To remove, add /lgtm cancel.
    lgtm label removed on each new commit push.
  • To mark PR as verified comment /verified to the PR, to un-verify comment /verified cancel to the PR.
    verified label removed on each new commit push.
  • To Cherry-pick a merged PR /cherry-pick <target_branch_name> to the PR. If <target_branch_name> is valid,
    and the current PR is merged, a cherry-picked PR would be created and linked to the current PR.
  • To build and push image to quay, add /build-push-pr-image in a comment. This would create an image with tag
    pr-<pr_number> to quay repository. This image tag, however would be deleted on PR merge or close action.
Supported labels

{'/verified', '/build-push-pr-image', '/lgtm', '/hold', '/cherry-pick', '/wip'}

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Mar 25, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: b7ccaf71-f8bc-458b-8dc1-5b8d402e2703

📥 Commits

Reviewing files that changed from the base of the PR and between 9ef3f9d and f9033dc.

📒 Files selected for processing (5)
  • tests/model_registry/conftest.py
  • tests/model_registry/constants.py
  • tests/model_registry/mcp_servers/config/conftest.py
  • tests/model_registry/mcp_servers/config/utils.py
  • tests/model_registry/mcp_servers/constants.py
💤 Files with no reviewable changes (1)
  • tests/model_registry/constants.py

📝 Walkthrough

Walkthrough

Constants and fixture references renamed from MCP-specific naming (DEFAULT_MCP_CATALOG_CM, mcp-catalog-sources) to generic model catalog naming (DEFAULT_CUSTOM_MODEL_CATALOG, model-catalog-sources). Base directory paths updated from /data/user-mcp-sources/ to /data/user-sources/.

Changes

Cohort / File(s) Summary
Constant removal and fixture updates
tests/model_registry/constants.py, tests/model_registry/conftest.py
Removed DEFAULT_MCP_CATALOG_CM constant definition; updated fixture to use DEFAULT_CUSTOM_MODEL_CATALOG (assumed to exist elsewhere). Docstring updated to reference "model-catalog-sources" instead of "mcp-catalog-sources".
Catalog path constant updates
tests/model_registry/mcp_servers/constants.py
Three exported path constants updated: MCP_SERVERS_YAML_CATALOG_PATH, MCP_SERVERS_YAML2_CATALOG_PATH, MCP_SERVERS_YAML_INVALID_CATALOG_PATH changed from /data/user-mcp-sources/ to /data/user-sources/ base directory.
Fixture and utility imports
tests/model_registry/mcp_servers/config/conftest.py, tests/model_registry/mcp_servers/config/utils.py
Docstring updated and import changed from DEFAULT_MCP_CATALOG_CM to DEFAULT_CUSTOM_MODEL_CATALOG in utils module. Fixture docstring references updated to "model-catalog-sources".

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Actionable issue: Verify that DEFAULT_CUSTOM_MODEL_CATALOG constant is defined and exported from the appropriate module before this diff is merged, as the removal of DEFAULT_MCP_CATALOG_CM creates an undefined symbol unless the new constant already exists in the codebase.

🚥 Pre-merge checks | ✅ 1 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Description check ⚠️ Warning The description mentions the reverted PR but lacks details about testing, related issues, and required checklist items from the template. Complete the description template by adding: Summary section explaining what was reverted and why, Related Issues section with the issue link, and Testing section with relevant checkboxes checked.
✅ Passed checks (1 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately reflects the main change: reverting a previous commit that modified ConfigMap references and paths.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch revert-1295-mcp_cm

Comment @coderabbitai help to get the list of available commands and usage tips.

@dbasunag dbasunag merged commit a9ba894 into main Mar 25, 2026
9 checks passed
@dbasunag dbasunag deleted the revert-1295-mcp_cm branch March 25, 2026 16:06
@github-actions
Copy link
Copy Markdown

Status of building tag latest: success.
Status of pushing tag latest to image registry: success.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants