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:
1 parent
d701c181e1
commit
4e0c3555df
35 files changed
+90
-14
No files matched your search
+65
-1
@@ -593,6 +593,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-dashboards-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/dashboards-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/dashboards-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
|
||||
depends_on:
|
||||
@@ -601,6 +609,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-smoke-tests-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/smoke-tests-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/smoke-tests-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite panels-suite
|
||||
depends_on:
|
||||
@@ -609,6 +625,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-panels-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/panels-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/panels-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite various-suite
|
||||
depends_on:
|
||||
@@ -617,6 +641,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-various-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/various-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/various-suite
|
||||
- commands:
|
||||
- cd /
|
||||
- ./cpp-e2e/scripts/ci-run.sh azure ${DRONE_SOURCE_BRANCH}
|
||||
@@ -1908,6 +1940,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-dashboards-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/dashboards-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/dashboards-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
|
||||
depends_on:
|
||||
@@ -1916,6 +1956,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-smoke-tests-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/smoke-tests-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/smoke-tests-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite panels-suite
|
||||
depends_on:
|
||||
@@ -1924,6 +1972,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-panels-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/panels-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/panels-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite various-suite
|
||||
depends_on:
|
||||
@@ -1932,6 +1988,14 @@ steps:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-various-suite
|
||||
- commands:
|
||||
- ./bin/build e2e-tests --port 3001 --suite scenes/various-suite
|
||||
depends_on:
|
||||
- grafana-server
|
||||
environment:
|
||||
HOST: grafana-server
|
||||
image: cypress/included:13.10.0
|
||||
name: end-to-end-tests-scenes/various-suite
|
||||
- commands:
|
||||
- cd /
|
||||
- ./cpp-e2e/scripts/ci-run.sh azure ${DRONE_SOURCE_BRANCH}
|
||||
@@ -4996,6 +5060,6 @@ kind: secret
|
||||
name: gcr_credentials
|
||||
---
|
||||
kind: signature
|
||||
hmac: 06f574902baa67d8885abb48e48987f675d7637e30d4b783b3bb84e51b46cdaf
|
||||
hmac: a916fba452c568a0e1d392702db3423fa52652d8d60f65f7b7aa43a7c1e952f4
|
||||
|
||||
...
|
||||
@@ -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
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2
-2
@@ -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'));
|
||||
});
|
||||
File renamed without changes.
+2
-2
@@ -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'));
|
||||
});
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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);
|
||||
});
|
||||
|
||||
@@ -95,9 +95,13 @@ def build_e2e(trigger, ver_mode):
|
||||
[
|
||||
grafana_server_step(),
|
||||
e2e_tests_step("dashboards-suite"),
|
||||
e2e_tests_step("scenes/dashboards-suite"),
|
||||
e2e_tests_step("smoke-tests-suite"),
|
||||
e2e_tests_step("scenes/smoke-tests-suite"),
|
||||
e2e_tests_step("panels-suite"),
|
||||
e2e_tests_step("scenes/panels-suite"),
|
||||
e2e_tests_step("various-suite"),
|
||||
e2e_tests_step("scenes/various-suite"),
|
||||
cloud_plugins_e2e_tests_step(
|
||||
"cloud-plugins-suite",
|
||||
cloud = "azure",
|
||||
|
||||
Reference in new issue
Block a user