update ci for grafana 10

performancecopilot · Mar 25, 2024 · 11473aa · 11473aa
1 parent a3978b6
commit 11473aa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        grafana_image: ['grafana:latest', 'grafana:9.0.9']
+        grafana_image: ['grafana:latest', 'grafana:10.2.5', 'grafana:9.0.9']
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/cypress/e2e/datasources/redis.cy.ts b/cypress/e2e/datasources/redis.cy.ts
@@ -20,8 +20,16 @@ describe('PCP Redis data source', () => {
 
     it('should auto-complete metric names', () => {
         cy.visit('/dashboard/new');
-        cy.contains('Add a new panel').click();
 
+        //tests for grafana 10 UI
+        if (cy.contains('Add visualization').should('exist')) {
+            cy.contains('Add visualization').click();
+
+            //select redis datasource from the modal
+            cy.get('div.scrollbar-view').contains('PCP Redis').click({ force: true });
+        } else {
+            cy.contains('Add a new panel').click();
+        }
         // start typing
         cy.get('.monaco-editor textarea').type('disk.dev.by', { force: true });
         cy.contains('disk.dev.total_bytes'); // auto-complete

diff --git a/cypress/e2e/datasources/vector.cy.ts b/cypress/e2e/datasources/vector.cy.ts
@@ -20,7 +20,16 @@ describe('PCP Vector data source', () => {
 
     it('should auto-complete metric names', () => {
         cy.visit('/dashboard/new');
-        cy.contains('Add a new panel').click();
+
+        //test for Grafana 10 UI
+        if (cy.contains('Add visualization').should('exist')) {
+            cy.contains('Add visualization').click();
+
+            //select vector datasource from the modal
+            cy.contains('PCP Vector').click();
+        } else {
+            cy.contains('Add a new panel').click();
+        }
 
         // start typing
         cy.get('.monaco-editor').type('disk.dev.write_b');