ci: fix expensive e2e tests (#4867)
wait until plugin backend is built before grafana starts via ops-devenv
## Checklist
- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- [x] Added the relevant release notes label (see labels prefixed w/
`release:`). These labels dictate how your PR will
show up in the autogenerated release notes.
This commit is contained in:
parent
68caa12d5b
commit
2164e75854
3 changed files with 6 additions and 19 deletions
1
.github/workflows/e2e-tests.yml
vendored
1
.github/workflows/e2e-tests.yml
vendored
|
|
@ -168,7 +168,6 @@ jobs:
|
|||
|
||||
- name: Tilt CI - standard E2E tests
|
||||
shell: bash
|
||||
if: ${{ inputs.run-expensive-tests == false }}
|
||||
env:
|
||||
GRAFANA_VERSION: ${{ inputs.grafana_version }}
|
||||
BROWSERS: ${{ inputs.browsers }}
|
||||
|
|
|
|||
17
.github/workflows/expensive-e2e-tests.yml
vendored
17
.github/workflows/expensive-e2e-tests.yml
vendored
|
|
@ -14,21 +14,8 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
grafana_version:
|
||||
# OnCall doesn't work on the following versions of Grafana
|
||||
# - 8.5.22
|
||||
# - 9.0.0
|
||||
# - 9.1.0
|
||||
|
||||
# 10.0.11 is the earliest version where things work
|
||||
# - 9.2.20
|
||||
# - 9.3.16
|
||||
# - 9.4.13
|
||||
# - 9.5.7
|
||||
- 10.1.7
|
||||
- 10.3.3
|
||||
# TODO: fix issues with running e2e tests against Grafana v10.2.x and v10.3.x
|
||||
# - 10.2.4
|
||||
# - latest
|
||||
fail-fast: false
|
||||
# Run one version at a time to avoid the issue when SMS notification are bundled together for multiple versions
|
||||
# running at the same time (the affected test is in grafana-plugin/e2e-tests/alerts/sms.test.ts)
|
||||
|
|
@ -37,10 +24,6 @@ jobs:
|
|||
with:
|
||||
grafana_version: ${{ matrix.grafana_version }}
|
||||
run-expensive-tests: true
|
||||
# TODO: fix issues with some tests on firefox and webkit
|
||||
# example CI build with firefox/webkit failing tests
|
||||
# https://github.com/grafana/oncall/actions/runs/8022194346/job/21915964672#step:19:905
|
||||
# browsers: "chromium firefox webkit"
|
||||
browsers: "chromium"
|
||||
secrets: inherit
|
||||
|
||||
|
|
|
|||
7
Tiltfile
7
Tiltfile
|
|
@ -17,6 +17,8 @@ DOCKER_REGISTRY = "localhost:63628/"
|
|||
|
||||
load("ext://docker_build_sub", "docker_build_sub")
|
||||
|
||||
grafana_deps = ["grafana-oncall-app-provisioning-configmap", "build-ui", "build-oncall-plugin-backend"]
|
||||
|
||||
def get_profiles():
|
||||
profiles = os.getenv('ONCALL_PROFILES', 'grafana,plugin,backend,tests')
|
||||
return profiles.split(',')
|
||||
|
|
@ -38,6 +40,9 @@ def extra_env():
|
|||
"ONCALL_API_URL": "http://oncall-dev-engine:8080"
|
||||
}
|
||||
|
||||
def extra_deps():
|
||||
return grafana_deps
|
||||
|
||||
|
||||
allow_k8s_contexts(["kind-kind"])
|
||||
|
||||
|
|
@ -107,7 +112,7 @@ def load_grafana():
|
|||
context="grafana-plugin",
|
||||
plugin_files=["grafana-plugin/src/plugin.json"],
|
||||
namespace="default",
|
||||
deps=["grafana-oncall-app-provisioning-configmap", "build-ui", "build-oncall-plugin-backend"],
|
||||
deps=grafana_deps,
|
||||
extra_env={
|
||||
"GF_SECURITY_ADMIN_PASSWORD": "oncall",
|
||||
"GF_SECURITY_ADMIN_USER": "oncall",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue