diff --git a/.drone.yml b/.drone.yml index a7ce2b6a034..21d670c58b0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -208,7 +208,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-dashboards-suite - commands: - apt-get install -y netcat @@ -217,7 +217,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-smoke-tests-suite - commands: - apt-get install -y netcat @@ -226,7 +226,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-panels-suite - commands: - apt-get install -y netcat @@ -235,7 +235,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-various-suite - commands: - apt-get update @@ -745,7 +745,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-dashboards-suite - commands: - apt-get install -y netcat @@ -754,7 +754,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-smoke-tests-suite - commands: - apt-get install -y netcat @@ -763,7 +763,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-panels-suite - commands: - apt-get install -y netcat @@ -772,7 +772,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-various-suite - commands: - apt-get update @@ -1380,7 +1380,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-dashboards-suite - commands: - apt-get install -y netcat @@ -1389,7 +1389,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-smoke-tests-suite - commands: - apt-get install -y netcat @@ -1398,7 +1398,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-panels-suite - commands: - apt-get install -y netcat @@ -1407,7 +1407,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-various-suite - commands: - apt-get update @@ -1982,7 +1982,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-dashboards-suite - commands: - apt-get install -y netcat @@ -1991,7 +1991,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-smoke-tests-suite - commands: - apt-get install -y netcat @@ -2000,7 +2000,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-panels-suite - commands: - apt-get install -y netcat @@ -2009,7 +2009,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-various-suite - commands: - apt-get update @@ -3134,7 +3134,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-dashboards-suite - commands: - apt-get install -y netcat @@ -3143,7 +3143,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-smoke-tests-suite - commands: - apt-get install -y netcat @@ -3152,7 +3152,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-panels-suite - commands: - apt-get install -y netcat @@ -3161,7 +3161,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-various-suite - commands: - apt-get update @@ -3661,7 +3661,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-dashboards-suite - commands: - apt-get install -y netcat @@ -3670,7 +3670,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-smoke-tests-suite - commands: - apt-get install -y netcat @@ -3679,7 +3679,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-panels-suite - commands: - apt-get install -y netcat @@ -3688,7 +3688,7 @@ steps: - grafana-server environment: HOST: grafana-server - image: cypress/included:9.3.1 + image: cypress/included:9.5.0 name: end-to-end-tests-various-suite - commands: - apt-get update @@ -4305,6 +4305,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: d9de3f45c31338ed1936f253e8a1f3390822468daeb3395bc368dced68068519 +hmac: b92ebbf48ca675f25c96f4b182a72c08b0e79f9c50d29caaacab124e97f32b4d ... diff --git a/package.json b/package.json index ba20522e9b9..9e53a1b81cf 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "copy-webpack-plugin": "9.0.1", "css-loader": "6.6.0", "css-minimizer-webpack-plugin": "3.4.1", - "cypress": "9.3.1", + "cypress": "9.5.0", "enzyme": "3.11.0", "enzyme-to-json": "3.6.2", "eslint": "8.9.0", diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index 18f138f6b27..11d719ca564 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -55,7 +55,7 @@ "blink-diff": "1.0.13", "chrome-remote-interface": "0.31.2", "commander": "8.3.0", - "cypress": "9.3.1", + "cypress": "9.5.0", "cypress-file-upload": "5.0.8", "devtools-protocol": "0.0.967529", "execa": "5.1.1", diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 26b03acdba3..837a27d9253 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -695,7 +695,7 @@ def e2e_tests_step(suite, edition, port=3001, tries=None): cmd += ' --tries {}'.format(tries) return { 'name': 'end-to-end-tests-{}'.format(suite) + enterprise2_suffix(edition), - 'image': 'cypress/included:9.3.1', + 'image': 'cypress/included:9.5.0', 'depends_on': [ 'grafana-server', ], diff --git a/yarn.lock b/yarn.lock index 3a5ae2f855f..a33f6e7fff9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4092,7 +4092,7 @@ __metadata: blink-diff: 1.0.13 chrome-remote-interface: 0.31.2 commander: 8.3.0 - cypress: 9.3.1 + cypress: 9.5.0 cypress-file-upload: 5.0.8 devtools-protocol: 0.0.967529 execa: 5.1.1 @@ -16623,9 +16623,9 @@ __metadata: languageName: node linkType: hard -"cypress@npm:9.3.1": - version: 9.3.1 - resolution: "cypress@npm:9.3.1" +"cypress@npm:9.5.0": + version: 9.5.0 + resolution: "cypress@npm:9.5.0" dependencies: "@cypress/request": ^2.88.10 "@cypress/xvfb": ^1.2.4 @@ -16664,14 +16664,14 @@ __metadata: pretty-bytes: ^5.6.0 proxy-from-env: 1.0.0 request-progress: ^3.0.0 + semver: ^7.3.2 supports-color: ^8.1.1 tmp: ~0.2.1 untildify: ^4.0.0 - url: ^0.11.0 yauzl: ^2.10.0 bin: cypress: bin/cypress - checksum: 6992e0f293618d1dec2cbd278fae08c9c3375ce462a1f767f735b06faa9a52ad375d174f2371103e443f3dc1d5cbb2c93d2ca73204d99bbd845db033d9891270 + checksum: 0a4ef1413676e37c19526e86dba7bc82420b9afa840b2a68b94e749b878e6b394f4e64bb099bca12c44f4520e7a1cb07ab17d6c9ccf87746bc1bfc3c9555f334 languageName: node linkType: hard @@ -20779,7 +20779,7 @@ __metadata: core-js: 3.21.0 css-loader: 6.6.0 css-minimizer-webpack-plugin: 3.4.1 - cypress: 9.3.1 + cypress: 9.5.0 d3: 5.15.0 d3-force: ^2.1.1 d3-scale-chromatic: 1.5.0