public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Remove migrated e2e tests from drone pipelines (#106960)

Browse Source
This commit is contained in:
Jev Forsberg
2025-06-19 06:00:18 +02:00
committed by GitHub
parent 700c9a857c
commit bb03ed54d3
4 changed files with 39 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+13 -165
View File
@@ -257,78 +257,6 @@ steps:
GF_SERVER_ROUTER_LOGGING: "1"
image: alpine:3.21.3
name: grafana-server
- commands:
- ./bin/build e2e-tests --port 3001 --suite dashboards-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-dashboards-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/dashboards-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/dashboards-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-smoke-tests-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/smoke-tests-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/smoke-tests-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite panels-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-panels-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/panels-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/panels-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite various-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-various-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/various-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/various-suite
- commands:
- GITHUB_TOKEN=$(cat /github-app/token)
- cd /
@@ -417,8 +345,8 @@ steps:
- failure
- commands:
- export GITHUB_TOKEN=$(cat /github-app/token)
- if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'missing videos';
false; fi
- if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'no e2e videos found
from remaining tests'; exit 0; fi
- apt-get update
- apt-get install -yq zip
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
@@ -432,10 +360,8 @@ steps:
\"description\": \"Click on the details to download e2e recording videos\", \"context\":
\"e2e_artifacts\"}"'
depends_on:
- end-to-end-tests-dashboards-suite
- end-to-end-tests-panels-suite
- end-to-end-tests-smoke-tests-suite
- end-to-end-tests-various-suite
- end-to-end-tests-cloud-plugins-suite-azure
- playwright-plugin-e2e
- github-app-generate-token
environment:
E2E_TEST_ARTIFACTS_BUCKET: releng-pipeline-artifacts-dev
@@ -802,78 +728,6 @@ steps:
GF_SERVER_ROUTER_LOGGING: "1"
image: alpine:3.21.3
name: grafana-server
- commands:
- ./bin/build e2e-tests --port 3001 --suite dashboards-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-dashboards-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/dashboards-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/dashboards-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-smoke-tests-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/smoke-tests-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/smoke-tests-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite panels-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-panels-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/panels-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/panels-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite various-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-various-suite
- commands:
- ./bin/build e2e-tests --port 3001 --suite old-arch/various-suite
depends_on:
- grafana-server
- build-test-plugins
environment:
HOST: grafana-server
image: cypress/included:14.3.2
name: end-to-end-tests-old-arch/various-suite
- commands:
- GITHUB_TOKEN=$(cat /github-app/token)
- cd /
@@ -962,8 +816,8 @@ steps:
- failure
- commands:
- export GITHUB_TOKEN=$(cat /github-app/token)
- if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'missing videos';
false; fi
- if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'no e2e videos found
from remaining tests'; exit 0; fi
- apt-get update
- apt-get install -yq zip
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
@@ -977,10 +831,8 @@ steps:
\"description\": \"Click on the details to download e2e recording videos\", \"context\":
\"e2e_artifacts\"}"'
depends_on:
- end-to-end-tests-dashboards-suite
- end-to-end-tests-panels-suite
- end-to-end-tests-smoke-tests-suite
- end-to-end-tests-various-suite
- end-to-end-tests-cloud-plugins-suite-azure
- playwright-plugin-e2e
- github-app-generate-token
environment:
E2E_TEST_ARTIFACTS_BUCKET: releng-pipeline-artifacts-dev
@@ -1027,10 +879,8 @@ steps:
- ./bin/build store-storybook --deployment canary
depends_on:
- build-storybook
- end-to-end-tests-dashboards-suite
- end-to-end-tests-panels-suite
- end-to-end-tests-smoke-tests-suite
- end-to-end-tests-various-suite
- end-to-end-tests-cloud-plugins-suite-azure
- playwright-plugin-e2e
environment:
GCP_KEY:
from_secret: gcp_grafanauploads
@@ -1086,10 +936,8 @@ steps:
- apk add --update bash git
- ./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org'
depends_on:
- end-to-end-tests-dashboards-suite
- end-to-end-tests-panels-suite
- end-to-end-tests-smoke-tests-suite
- end-to-end-tests-various-suite
- end-to-end-tests-cloud-plugins-suite-azure
- playwright-plugin-e2e
- build-frontend-packages
environment:
NPM_TOKEN:
@@ -3136,6 +2984,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: e6c1b534a4d8744e0290343b9bbb6932b0284cd422f53146fcdbbb2919aa8a20
hmac: 6dad99efcf9a41b8964e347e66d4e33861d6d08871294ed70033e4b653963dfd
...
.github/workflows/pr-e2e-tests.yml
+2
View File
@@ -28,6 +28,7 @@ jobs:
persist-credentials: false
- uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
with:
version: "8.0.0"
verb: run
args: go -C grafana run ./pkg/build/cmd artifacts -a targz:grafana:linux/amd64 --grafana-dir="${PWD}/grafana" > out.txt
- run: mv "$(cat out.txt)" grafana.tar.gz
@@ -118,6 +119,7 @@ jobs:
- name: Run E2E tests
uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
with:
version: "8.0.0"
verb: run
args: go run ./pkg/build/e2e --package=grafana.tar.gz
--suite=${{ matrix.path }}
scripts/drone/pipelines/build.star
+3 -10
View File
@@ -14,7 +14,6 @@ load(
"compile_build_cmd",
"download_grabpl_step",
"e2e_tests_artifacts",
"e2e_tests_step",
"enterprise_downstream_step",
"frontend_metrics_step",
"grafana_server_step",
@@ -122,14 +121,8 @@ def build_e2e(trigger, ver_mode):
publish_docker,
build_test_plugins_step(),
grafana_server_step(),
e2e_tests_step("dashboards-suite"),
e2e_tests_step("old-arch/dashboards-suite"),
e2e_tests_step("smoke-tests-suite"),
e2e_tests_step("old-arch/smoke-tests-suite"),
e2e_tests_step("panels-suite"),
e2e_tests_step("old-arch/panels-suite"),
e2e_tests_step("various-suite"),
e2e_tests_step("old-arch/various-suite"),
# Note: Main E2E test suites (dashboards, panels, smoke-tests, various) have been migrated to GitHub Actions
# Only keeping tests that are not yet covered by GitHub Actions
cloud_plugins_e2e_tests_step(
"cloud-plugins-suite",
cloud = "azure",
@@ -138,7 +131,7 @@ def build_e2e(trigger, ver_mode):
playwright_e2e_tests_step(),
playwright_e2e_report_upload(),
playwright_e2e_report_post_link(),
e2e_tests_artifacts(),
e2e_tests_artifacts(), # Collects artifacts from remaining E2E tests
build_storybook_step(ver_mode = ver_mode),
test_a11y_frontend_step(ver_mode = ver_mode),
],
scripts/drone/steps/lib.star
+21 -16
View File
@@ -315,14 +315,16 @@ def store_storybook_step(ver_mode, trigger = None):
return step
def e2e_tests_artifacts():
# Note: This function is kept for backward compatibility but now only handles
# artifacts from the remaining E2E tests that haven't been migrated to GitHub Actions
return {
"name": "e2e-tests-artifacts-upload",
"image": images["cloudsdk"],
"depends_on": [
"end-to-end-tests-dashboards-suite",
"end-to-end-tests-panels-suite",
"end-to-end-tests-smoke-tests-suite",
"end-to-end-tests-various-suite",
# Note: Main E2E tests have been migrated to GitHub Actions
# Only depend on remaining Drone E2E tests
"end-to-end-tests-cloud-plugins-suite-azure",
"playwright-plugin-e2e",
github_app_generate_token_step()["name"],
],
"failure": "ignore",
@@ -338,8 +340,8 @@ def e2e_tests_artifacts():
},
"commands": [
"export GITHUB_TOKEN=$(cat /github-app/token)",
# if no videos found do nothing
"if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'missing videos'; false; fi",
# if no videos found do nothing (may be fewer videos now that main tests are in GitHub Actions)
"if [ -z `find ./e2e -type f -name *spec.ts.mp4` ]; then echo 'no e2e videos found from remaining tests'; exit 0; fi",
"apt-get update",
"apt-get install -yq zip",
"printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json",
@@ -969,12 +971,15 @@ def release_canary_npm_packages_step(trigger = None):
return step
def upload_packages_step(ver_mode, trigger = None, depends_on = [
"end-to-end-tests-dashboards-suite",
"end-to-end-tests-panels-suite",
"end-to-end-tests-smoke-tests-suite",
"end-to-end-tests-various-suite",
]):
def upload_packages_step(
ver_mode,
trigger = None,
depends_on = [
# Note: Main E2E tests have been migrated to GitHub Actions
# Updated dependencies to only include remaining Drone E2E tests
"end-to-end-tests-cloud-plugins-suite-azure",
"playwright-plugin-e2e",
]):
"""Upload packages to object storage.
Args:
@@ -1135,11 +1140,11 @@ def verify_gen_jsonnet_step():
}
def end_to_end_tests_deps():
# Note: Main E2E tests have been migrated to GitHub Actions
# Only return dependencies for E2E tests that still run in Drone
return [
"end-to-end-tests-dashboards-suite",
"end-to-end-tests-panels-suite",
"end-to-end-tests-smoke-tests-suite",
"end-to-end-tests-various-suite",
"end-to-end-tests-cloud-plugins-suite-azure",
"playwright-plugin-e2e",
]
def compile_build_cmd():