Run tests for 2 Grafana versions - #321
Open
laserninja wants to merge 9 commits into
Open
Conversation
Reviewer's guide (collapsed on small PRs)Reviewer's GuideThe CI workflow now includes a health-check loop that waits for Grafana to be fully ready before kicking off end-to-end tests, enabling reliable testing across multiple Grafana versions. Sequence diagram for Grafana health check before tests in CIsequenceDiagram
participant CI as "CI Workflow"
participant Grafana as "Grafana Container"
CI->>Grafana: Start container (matrix.grafana)
loop Health check
CI->>Grafana: GET /api/health
Grafana-->>CI: Response ("ok" or not ready)
alt Not ready
CI->>CI: Wait 5 seconds
else Ready
CI->>CI: Proceed to tests
end
end
CI->>CI: Run end-to-end tests
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Hey there - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `.github/workflows/ci.yml:92-98` </location>
<code_context>
grafana/grafana:${{ matrix.grafana }}
+ echo "Waiting for Grafana to be ready..."
+ while true; do
+ if curl -s http://localhost:3000/api/health | grep -q "ok"; then
+ echo "Grafana is ready!"
+ break
+ fi
+ echo "Waiting for Grafana..."
+ sleep 5
+ done
+
</code_context>
<issue_to_address>
**suggestion:** Consider adding a timeout to the Grafana readiness loop.
Without a timeout, the loop may cause CI jobs to hang if Grafana never becomes ready. Implementing a timeout or retry limit will prevent indefinite waiting and surface failures promptly.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Merged
Contributor
Author
|
Can someone review this please. |
…_VERSION - Use GRAFANA_VERSION env var to pick correct selectors per version - 9.x: aria-label selectors, 10+: data-testid selectors - Add waitForLoadState after login to prevent Target closed errors - Use version-specific Format As dropdown interaction - Increase table body assertion timeout to 30s for slow CI - Increase test timeout to 60s in CI - Fix wrong-credentials tests: assert no success message instead
…ult detection
- Remove waitForLoadState('networkidle') - hangs on 11.x WebSocket connections
- Remove waitForSelector('[role=alert]') - not present in 9.x
- Add waitForSaveTestResult() that waits for 'Data source is working' or
'Data source is not working' text (reliable across all Grafana versions)
- Remove waitForSelector from setup functions (no longer needed)
- Simplify wrong-credentials tests to assert ok===false
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by Sourcery
Run end-to-end tests against two Grafana versions in CI and ensure Grafana is fully ready before testing
Enhancements:
CI: