mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
DashboardScene: Include scenes e2e in pr checks (#89297)
* adjust drone to run scenes e2e alongside * adjust typo in scenes e2e folder name for consistency * fix select options selector inssue with scenes bump * skip tests in old arch that result in race conditions * skip more flaky tests due to race conditions * skip scenes e2e instead of old arch in case of race condition * update to latest scenes version * skip test due to race conditions * skip flaky race condition test * modify and sign drone pipeline * remove unnecessary edits * resolve merge conflicts and regenerate drone.yml
This commit is contained in:
@@ -106,6 +106,11 @@ case "$1" in
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"scenes/"*)
|
||||
cypressConfig[specPattern]=./e2e/"${args[0]}"/$testFilesForSingleSuite
|
||||
cypressConfig[video]=${args[1]}
|
||||
env[SCENES]=true
|
||||
;;
|
||||
"enterprise-smtp")
|
||||
env[SMTP_PLUGIN_ENABLED]=true
|
||||
cypressConfig[specPattern]=./e2e/extensions/enterprise/smtp-suite/$testFilesForSingleSuite
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import testDashboard from '../dashboards/TestDashboard.json';
|
||||
import { e2e } from '../utils';
|
||||
|
||||
describe('Dashboard browse', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/dashboards-suite/dashboard-browse.spec.ts
|
||||
describe.skip('Dashboard browse', () => {
|
||||
beforeEach(() => {
|
||||
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
|
||||
});
|
||||
@@ -1,6 +1,6 @@
|
||||
import { e2e } from '../utils';
|
||||
|
||||
describe('Public dashboards', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/dashboards-suite/dashboard-public-create.spec.ts
|
||||
describe.skip('Public dashboards', () => {
|
||||
beforeEach(() => {
|
||||
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
|
||||
});
|
||||
@@ -2,8 +2,8 @@ import panelSandboxDashboard from '../../dashboards/PanelSandboxDashboard.json';
|
||||
import { e2e } from '../../utils';
|
||||
|
||||
const DASHBOARD_ID = 'c46b2460-16b7-42a5-82d1-b07fbf431950';
|
||||
|
||||
describe('Panel sandbox', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/panels-suite/frontend-sandbox-panel.spec.ts
|
||||
describe.skip('Panel sandbox', () => {
|
||||
beforeEach(() => {
|
||||
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), true);
|
||||
return e2e.flows.importDashboard(panelSandboxDashboard, 1000, true);
|
||||
|
||||
@@ -17,8 +17,8 @@ const addDataSource = () => {
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
describe('Exemplars', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/various-suite/exemplars.spec.ts
|
||||
describe.skip('Exemplars', () => {
|
||||
beforeEach(() => {
|
||||
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
|
||||
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { e2e } from '../utils';
|
||||
const DASHBOARD_ID = 'ed155665';
|
||||
|
||||
describe('Annotations filtering', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/various-suite/filter-annotations.spec.ts
|
||||
describe.skip('Annotations filtering', () => {
|
||||
beforeEach(() => {
|
||||
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
|
||||
});
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { e2e } from '../utils';
|
||||
import { fromBaseUrl } from '../utils/support/url';
|
||||
|
||||
describe('Keyboard shortcuts', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/various-suite/keybinds.spec.ts
|
||||
describe.skip('Keyboard shortcuts', () => {
|
||||
beforeEach(() => {
|
||||
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
|
||||
|
||||
|
||||
@@ -110,7 +110,8 @@ const lokiQueryResult = {
|
||||
},
|
||||
};
|
||||
|
||||
describe('Loki Query Editor', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/various-suite/loki-table-explore-to-dash.spec.ts
|
||||
describe.skip('Loki Query Editor', () => {
|
||||
beforeEach(() => {
|
||||
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
|
||||
});
|
||||
|
||||
@@ -77,8 +77,8 @@ function variableFlowToQueryEditor(variableName: string, queryType: string) {
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
|
||||
describe('Prometheus variable query editor', () => {
|
||||
// Skipping due to race conditions with same old arch test e2e/various-suite/prometheus-variable-editor.spec.ts
|
||||
describe.skip('Prometheus variable query editor', () => {
|
||||
beforeEach(() => {
|
||||
createPromDS(DATASOURCE_ID, DATASOURCE_NAME);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user