Skip to content

[Main] Promote development to main#231

Merged
michael-valdron merged 6 commits into
mainfrom
mvaldron-promote-from-development-1
Jun 25, 2026
Merged

[Main] Promote development to main#231
michael-valdron merged 6 commits into
mainfrom
mvaldron-promote-from-development-1

Conversation

@michael-valdron

Copy link
Copy Markdown
Contributor

What does this PR do?

Promotes what we currently have for the latest 1.10 changes to main:

More specifically:

  • Updates chart to 6.1.1
  • Updates vector store to 1.10 based
  • Syncs llama-stack-config.yaml, rhdh-profile.py, and charts/rhdh/values.yaml with the updated image versions
  • Fixes CI tests

Which issue(s) does this PR fix

https://redhat.atlassian.net/browse/RHDHBUGS-3410

How to test changes / Special notes to the reviewer

rhdh-ai-envs-sync-bot Bot and others added 6 commits June 25, 2026 10:07
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* (chore): sync lightspeed configs from lightspeed-configs@6d248f75e1a69c0d0e463c0ccfb3c9917467d67b

* Bump up RHDH Chart to 6.1.1

* Fix CI tests

---------

Co-authored-by: Jdubrick <65578646+Jdubrick@users.noreply.github.com>
Co-authored-by: thepetk <thepetk@gmail.com>
@qodo-code-review

Copy link
Copy Markdown

PR Summary by Qodo

Promote 1.10 updates to main (chart 6.1.1, vector store 1.10, CI test fixes)
⚙️ Configuration changes 🧪 Tests ✨ Enhancement 🐞 Bug fix 🕐 20-40 Minutes

Grey Divider

Description

• Bump the RHDH Helm chart dependency to 6.1.1 and update the RHDH image tag to 1.10-135.
• Switch RAG/vector-store configuration and CI init paths from 1.9 to 1.10 content.
• Stabilize CI by silencing flaky Lightspeed tests and relaxing an extensions assertion.
Diagram

graph TD
  A["charts/rhdh/Chart.yaml"] --> B["Backstage dep 6.1.1"]
  C["charts/rhdh/values.yaml"] --> D["RHDH image 1.10-135"]
  E["charts/rhdh/templates/llama-stack-config.yaml"] --> F[("Vector store 1.10")]
  G["ci/values-ci.yaml"] --> F
  H["UI tests (pytest)"] --> I["CI stability"]
Loading
High-Level Assessment

The following are alternative approaches to this PR:

1. Mark Lightspeed tests as xfail/optional (marker + CI job split)
  • ➕ Keeps test coverage visible while preventing main CI from failing
  • ➕ Allows targeted stabilization without losing signal entirely
  • ➖ Requires CI pipeline changes (separate job/allow-failure semantics)
  • ➖ Still leaves some maintenance overhead for a flaky suite
2. Add bounded retries/timeouts for Lightspeed flows
  • ➕ Can reduce transient UI flakiness without removing tests
  • ➕ Minimal changes to how tests are invoked
  • ➖ Retries can mask real regressions and increase CI duration
  • ➖ Flakiness due to real UI changes may persist
3. Replace with overlays repo e2e integration (as noted in-file)
  • ➕ Moves coverage to a better-suited end-to-end harness
  • ➕ Reduces duplication and UI drift across repos
  • ➖ Longer lead time; depends on external repo/workflows
  • ➖ May delay near-term confidence for Lightspeed functionality

Recommendation: The PR’s approach (temporarily removing Lightspeed tests from the default run and adding a clear rationale in-code) is a pragmatic short-term stabilization for main. If Lightspeed coverage is important for day-to-day confidence, consider a follow-up that re-enables them as an optional/allowed-failure job (or xfail-marked) while the longer-term plan migrates coverage into the overlays repo e2e suite.

Files changed (7) +17 / -13

Tests (3) +12 / -8
pyproject.tomlRemove Lightspeed tests from default test run +2/-4

Remove Lightspeed tests from default test run

• Comments out test_lightspeed.py from the configured testpaths to prevent it from running by default. Also normalizes filterwarnings formatting into a single-line list.

tests/pyproject.toml

test_extensions.pyMake installed-packages assertion less brittle +2/-4

Make installed-packages assertion less brittle

• Removes reliance on a specific sample package constant and instead asserts that the installed packages table has at least one row.

tests/test_extensions.py

test_lightspeed.pyDocument why Lightspeed tests are silenced +8/-0

Document why Lightspeed tests are silenced

• Adds commentary explaining that the Lightspeed tests are excluded due to CI flakiness and UI drift, and notes a longer-term direction to replace them with overlays repo e2e integration.

tests/test_lightspeed.py

Other (4) +5 / -5
Chart.yamlBump Backstage chart dependency to 6.1.1 +1/-1

Bump Backstage chart dependency to 6.1.1

• Updates the Helm chart dependency version for the Backstage chart from 5.8.0 to 6.1.1.

charts/rhdh/Chart.yaml

llama-stack-config.yamlAlign RAG vector-store config to 1.10 content +2/-2

Align RAG vector-store config to 1.10 content

• Updates the kv_rag DB path to use the 1.10 product-docs directory and changes the configured vector_store_id used for RHDH docs embeddings.

charts/rhdh/templates/llama-stack-config.yaml

values.yamlUpdate RHDH image tag to 1.10-135 +1/-1

Update RHDH image tag to 1.10-135

• Bumps the deployed RHDH Hub image tag from 1.10-128 to 1.10-135 in the chart values.

charts/rhdh/values.yaml

values-ci.yamlUpdate CI RAG directory initialization for 1.10 +1/-1

Update CI RAG directory initialization for 1.10

• Changes the CI init command to create the 1.10 RHDH product docs vector DB directory instead of 1.9.

ci/values-ci.yaml

@qodo-code-review

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (2) 📘 Rule violations (0) 📎 Requirement gaps (0) 📜 Skill insights (0)

Context used
✅ Tickets: RHDHBUGS-3410
✅ Compliance rules (platform): 4 rules

Grey Divider


Informational

1. Lightspeed tests excluded 🐞 Bug ☼ Reliability
Description
tests/test_lightspeed.py is no longer part of pytest’s configured testpaths, so CI runs that
execute uv run pytest will stop collecting/running Lightspeed E2E coverage. This reduces
regression detection for the Lightspeed UI path in both nightly and PR checks.
Code

tests/pyproject.toml[14]

+    # "test_lightspeed.py",
Relevance

⭐ Low

Lightspeed tests intentionally silenced as flaky; repo already runs pytest via tests/ (nightly.yml,
run-tests.sh).

PR-#100
PR-#209

ⓘ Recommendations generated based on similar findings in past PRs

Evidence
The PR comments out test_lightspeed.py in testpaths, and CI runs invoke pytest from tests/, so
the file will not be collected by default anymore.

tests/pyproject.toml[8-20]
.github/workflows/nightly.yml[35-44]
scripts/run-tests.sh[78-87]

Agent prompt
The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

### Issue description
`test_lightspeed.py` has been removed from pytest collection by commenting it out in `testpaths`, so it won’t run in CI (nightly and PR checks).

### Issue Context
CI executes pytest from `tests/` (e.g. `uv run pytest -v`), which relies on `tests/pyproject.toml`’s `testpaths` for what gets collected.

### Fix Focus Areas
- tests/pyproject.toml[8-15]
- .github/workflows/nightly.yml[35-44]
- scripts/run-tests.sh[78-87]

### Suggested fix
- Re-add `test_lightspeed.py` to `testpaths` and mark those tests with a dedicated marker (e.g. `@pytest.mark.lightspeed`), then exclude that marker from the default CI run.
- Add a separate workflow/job (or a separate `make` target) that runs `pytest -m lightspeed` on a schedule or in a dedicated “quarantine” stage, so coverage remains but flakiness is isolated.

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools


2. Installed packages check weakened 🐞 Bug ⚙ Maintainability
Description
test_extensions_installed_packages_lists_packages no longer validates that a known expected
package is present and instead only asserts that some table row exists. This reduces the test’s
ability to detect regressions where the installed-packages content is wrong but still renders a row.
Code

tests/test_extensions.py[R52-53]

+    assert extensions.page.locator("tbody tr").count() > 0, (
+        "Installed packages tab should list at least one package"
Relevance

⭐ Low

Team recently focused on “fix CI tests”; loosening brittle UI assertions likely intentional to
reduce flakiness.

PR-#209
PR-#100

ⓘ Recommendations generated based on similar findings in past PRs

Evidence
The test switched from validating a specific expected installed package (via the page object’s
helper/constant) to a generic row-count check, reducing assertion precision.

tests/test_extensions.py[47-54]
tests/pages/extensions_page.py[9-12]
tests/pages/extensions_page.py[90-96]

Agent prompt
The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

### Issue description
The test now asserts `tbody tr` count > 0 instead of checking for a known expected installed package entry.

### Issue Context
The page object still defines `INSTALLED_PACKAGE_SAMPLE` and a helper `installed_package(name)` intended to validate a specific expected row.

### Fix Focus Areas
- tests/test_extensions.py[47-54]
- tests/pages/extensions_page.py[9-12]
- tests/pages/extensions_page.py[90-96]

### Suggested fix
- Restore a content-based assertion, e.g. `assert extensions.installed_package(INSTALLED_PACKAGE_SAMPLE).count() > 0`.
- If the specific package is no longer stable across versions, update `INSTALLED_PACKAGE_SAMPLE` to a stable one, or assert for a stable pattern (e.g. a known column/value selector like `tbody tr td[value]`) rather than any `tbody tr`.

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools


Grey Divider

Qodo Logo

@Jdubrick Jdubrick left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm

@gabemontero

Copy link
Copy Markdown
Contributor

let me know if you don't see the merge button now @michael-valdron

if you do see it, hit it at your convenience

@michael-valdron michael-valdron merged commit a501e51 into main Jun 25, 2026
3 of 4 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.

4 participants