Skip to content

Run tests for 2 Grafana versions - #321

Open
laserninja wants to merge 9 commits into
trinodb:test-old-grafanafrom
laserninja:test-old-grafana
Open

Run tests for 2 Grafana versions#321
laserninja wants to merge 9 commits into
trinodb:test-old-grafanafrom
laserninja:test-old-grafana

Conversation

@laserninja

@laserninja laserninja commented Oct 29, 2025

Copy link
Copy Markdown
Contributor

Summary by Sourcery

Run end-to-end tests against two Grafana versions in CI and ensure Grafana is fully ready before testing

Enhancements:

  • Add a polling loop in the CI workflow to wait for Grafana's /api/health endpoint to report “ok” before running tests

CI:

  • Expand the CI matrix to test against two Grafana versions

@cla-bot cla-bot Bot added the cla-signed label Oct 29, 2025
@sourcery-ai

sourcery-ai Bot commented Oct 29, 2025

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

The 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 CI

sequenceDiagram
  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
Loading

File-Level Changes

Change Details Files
Add readiness probe loop in CI workflow
  • Echo waiting message before loop
  • Loop with curl to check /api/health until status is “ok”
  • Break loop when Grafana is ready
  • Sleep interval between retries
.github/workflows/ci.yml

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

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>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread .github/workflows/ci.yml
@laserninja

Copy link
Copy Markdown
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant