From 4080bcbd6c7ca1a6fd8ad2c36e2845f660942ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Thu, 2 Dec 2021 12:52:31 +0100 Subject: [PATCH] E2E: revert recordings (#42636) --- .drone.yml | 46 +------------------------------ packages/grafana-e2e/package.json | 2 +- scripts/drone/steps/lib.star | 1 - 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/.drone.yml b/.drone.yml index 29f2350c27b..b189f8fac9d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -210,7 +210,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -222,7 +221,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -234,7 +232,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -246,7 +243,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -636,7 +632,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -648,7 +643,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -660,7 +654,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -672,7 +665,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -1206,7 +1198,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -1218,7 +1209,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -1230,7 +1220,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -1242,7 +1231,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -1705,7 +1693,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -1717,7 +1704,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -1729,7 +1715,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -1741,7 +1726,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -1866,7 +1850,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite-enterprise2 @@ -1878,7 +1861,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite-enterprise2 @@ -1890,7 +1872,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite-enterprise2 @@ -1902,7 +1883,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite-enterprise2 @@ -2274,7 +2254,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -2286,7 +2265,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -2298,7 +2276,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -2310,7 +2287,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -2754,7 +2730,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -2766,7 +2741,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -2778,7 +2752,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -2790,7 +2763,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -2915,7 +2887,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite-enterprise2 @@ -2927,7 +2898,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite-enterprise2 @@ -2939,7 +2909,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite-enterprise2 @@ -2951,7 +2920,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite-enterprise2 @@ -3404,7 +3372,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -3416,7 +3383,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -3428,7 +3394,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -3440,7 +3405,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -3859,7 +3823,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite @@ -3871,7 +3834,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite @@ -3883,7 +3845,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite @@ -3895,7 +3856,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite @@ -4029,7 +3989,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-dashboards-suite-enterprise2 @@ -4041,7 +4000,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-smoke-tests-suite-enterprise2 @@ -4053,7 +4011,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-panels-suite-enterprise2 @@ -4065,7 +4022,6 @@ steps: depends_on: - cypress environment: - CYPRESS_RECORD_KEY: b4c5b453-078a-40f5-936c-993d6d8037eb HOST: end-to-end-tests-server-enterprise2 image: grafana/ci-e2e:12.19.0-1 name: end-to-end-tests-various-suite-enterprise2 @@ -4346,6 +4302,6 @@ kind: secret name: prerelease_bucket --- kind: signature -hmac: cf1b4ccefe97a76ffe9fb37268e20ddfb10696e45d131bcaa61421bfbd8d27c9 +hmac: 63011a7e74dab6811078cf83929581cc25cc8a2133c388a93b8284b98de1d379 ... diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index d8b74777766..f0b643468ca 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -25,7 +25,7 @@ "clean": "rimraf ./dist ./compiled", "docsExtract": "mkdir -p ../../reports/docs && api-extractor run 2>&1 | tee ../../reports/docs/$(basename $(pwd)).log", "open": "cypress open", - "start": "cypress run --browser=chrome --record --key=$CYPRESS_RECORD_KEY", + "start": "cypress run --browser=chrome", "test": "pushd test && node ../dist/bin/grafana-e2e.js run", "typecheck": "tsc --noEmit" }, diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 60b804e794c..35b02b64d0c 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -691,7 +691,6 @@ def e2e_tests_step(suite, edition, port=3001, tries=None): ], 'environment': { 'HOST': 'end-to-end-tests-server' + enterprise2_suffix(edition), - 'CYPRESS_RECORD_KEY': 'b4c5b453-078a-40f5-936c-993d6d8037eb', }, 'volumes': [{ 'name': 'cypress_cache',