Chore: move to cypress 13.1 (#74718)

* move to cypress 13.1 * update cloud-data-sources docker image Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2024-12-30 10:47:30 -06:00 · 2023-09-13 11:08:43 +01:00 · 2023-09-13 11:08:43 +01:00 · fcdae0ca0b
commit fcdae0ca0b
parent 5cb7eb5884
6 changed files with 79 additions and 34 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -613,7 +613,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-dashboards-suite
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
@ -621,7 +621,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite panels-suite
@ -629,7 +629,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-panels-suite
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite various-suite
@ -637,7 +637,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-various-suite
 - commands:
  - cd /
@ -655,7 +655,7 @@ steps:
    GITHUB_TOKEN:
      from_secret: github_token
    HOST: grafana-server
-  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:2.0.0
+  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:3.0.0
  name: end-to-end-tests-cloud-plugins-suite-azure
  when:
    paths:
@ -1753,7 +1753,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-dashboards-suite
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
@ -1761,7 +1761,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite panels-suite
@ -1769,7 +1769,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-panels-suite
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite various-suite
@ -1777,7 +1777,7 @@ steps:
  - grafana-server
  environment:
    HOST: grafana-server
-  image: cypress/included:12.15.0
+  image: cypress/included:13.1.0
  name: end-to-end-tests-various-suite
 - commands:
  - cd /
@ -1795,7 +1795,7 @@ steps:
    GITHUB_TOKEN:
      from_secret: github_token
    HOST: grafana-server
-  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:2.0.0
+  image: us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:3.0.0
  name: end-to-end-tests-cloud-plugins-suite-azure
  when:
    paths:
@ -3890,7 +3890,7 @@ steps:
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/drone-downstream
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docker-puppeteer:1.1.0
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docs-base:dbd975af06
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM cypress/included:12.15.0
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM cypress/included:13.1.0
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM jwilder/dockerize:0.6.1
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM koalaman/shellcheck:stable
  depends_on:
@ -3923,7 +3923,7 @@ steps:
  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/drone-downstream
  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docker-puppeteer:1.1.0
  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docs-base:dbd975af06
-  - trivy --exit-code 1 --severity HIGH,CRITICAL cypress/included:12.15.0
+  - trivy --exit-code 1 --severity HIGH,CRITICAL cypress/included:13.1.0
  - trivy --exit-code 1 --severity HIGH,CRITICAL jwilder/dockerize:0.6.1
  - trivy --exit-code 1 --severity HIGH,CRITICAL koalaman/shellcheck:stable
  depends_on:
@ -4170,6 +4170,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: b362851cbf94fa37274087630d7447d7dd9e6a4e19e94eec734559277ba1d498
+hmac: 61a1d1c141e2eec8ed8110600e6a9b910bee3e2e974bf711b969b3010364ca2d

 ...
--- a/e2e/run-suite
+++ b/e2e/run-suite
@ -39,7 +39,6 @@ declare -A cypressConfig=(
  [viewportWidth]=1920
  [viewportHeight]=1080
  [trashAssetsBeforeRuns]=false
-  [videoUploadOnPasses]=false
  [reporter]=./e2e/log-reporter.js
  [baseUrl]=${BASE_URL:-"http://$HOST:$PORT"}
 )
--- a/package.json
+++ b/package.json
@ -165,7 +165,7 @@
    "copy-webpack-plugin": "11.0.0",
    "css-loader": "6.8.1",
    "css-minimizer-webpack-plugin": "5.0.1",
-    "cypress": "12.15.0",
+    "cypress": "13.1.0",
    "cypress-file-upload": "5.0.8",
    "esbuild": "0.18.12",
    "esbuild-loader": "3.0.1",
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@ -736,7 +736,7 @@ def cloud_plugins_e2e_tests_step(suite, cloud, trigger = None):
    branch = "${DRONE_SOURCE_BRANCH}".replace("/", "-")
    step = {
        "name": "end-to-end-tests-{}-{}".format(suite, cloud),
-        "image": "us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:2.0.0",
+        "image": "us-docker.pkg.dev/grafanalabs-dev/cloud-data-sources/e2e:3.0.0",
        "depends_on": [
            "grafana-server",
        ],
--- a/scripts/drone/utils/images.star
+++ b/scripts/drone/utils/images.star
@ -29,7 +29,7 @@ images = {
    "drone_downstream": "grafana/drone-downstream",
    "docker_puppeteer": "grafana/docker-puppeteer:1.1.0",
    "docs": "grafana/docs-base:dbd975af06",
-    "cypress": "cypress/included:12.15.0",
+    "cypress": "cypress/included:13.1.0",
    "dockerize": "jwilder/dockerize:0.6.1",
    "shellcheck": "koalaman/shellcheck:stable",
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -2478,6 +2478,32 @@ __metadata:
  languageName: node
  linkType: hard

+"@cypress/request@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "@cypress/request@npm:3.0.1"
+  dependencies:
+    aws-sign2: ~0.7.0
+    aws4: ^1.8.0
+    caseless: ~0.12.0
+    combined-stream: ~1.0.6
+    extend: ~3.0.2
+    forever-agent: ~0.6.1
+    form-data: ~2.3.2
+    http-signature: ~1.3.6
+    is-typedarray: ~1.0.0
+    isstream: ~0.1.2
+    json-stringify-safe: ~5.0.1
+    mime-types: ~2.1.19
+    performance-now: ^2.1.0
+    qs: 6.10.4
+    safe-buffer: ^5.1.2
+    tough-cookie: ^4.1.3
+    tunnel-agent: ^0.6.0
+    uuid: ^8.3.2
+  checksum: 7175522ebdbe30e3c37973e204c437c23ce659e58d5939466615bddcd58d778f3a8ea40f087b965ae8b8138ea8d102b729c6eb18c6324f121f3778f4a2e8e727
+  languageName: node
+  linkType: hard
+
 "@cypress/webpack-preprocessor@npm:5.17.1":
  version: 5.17.1
  resolution: "@cypress/webpack-preprocessor@npm:5.17.1"
@ -10612,6 +10638,13 @@ __metadata:
  languageName: node
  linkType: hard

+"@types/node@npm:^16.18.39":
+  version: 16.18.50
+  resolution: "@types/node@npm:16.18.50"
+  checksum: 8aec1eaf83407197ec2fe947182c238f49b82a7aace867cee1f81f72eb8a76c3c8b2adb1fd356e7443317cffb2546708da8934299a579edd25e3160bf7af30a1
+  languageName: node
+  linkType: hard
+
 "@types/normalize-package-data@npm:^2.4.0":
  version: 2.4.1
  resolution: "@types/normalize-package-data@npm:2.4.1"
@ -15554,13 +15587,13 @@ __metadata:
  languageName: node
  linkType: hard

-"cypress@npm:12.15.0":
-  version: 12.15.0
-  resolution: "cypress@npm:12.15.0"
+"cypress@npm:13.1.0":
+  version: 13.1.0
+  resolution: "cypress@npm:13.1.0"
  dependencies:
-    "@cypress/request": ^2.88.10
+    "@cypress/request": ^3.0.0
    "@cypress/xvfb": ^1.2.4
-    "@types/node": ^14.14.31
+    "@types/node": ^16.18.39
    "@types/sinonjs__fake-timers": 8.1.1
    "@types/sizzle": ^2.3.2
    arch: ^2.2.0
@ -15593,16 +15626,17 @@ __metadata:
    minimist: ^1.2.8
    ospath: ^1.2.2
    pretty-bytes: ^5.6.0
+    process: ^0.11.10
    proxy-from-env: 1.0.0
    request-progress: ^3.0.0
-    semver: ^7.3.2
+    semver: ^7.5.3
    supports-color: ^8.1.1
    tmp: ~0.2.1
    untildify: ^4.0.0
    yauzl: ^2.10.0
  bin:
    cypress: bin/cypress
-  checksum: a1989386bc0843377526c71d60a7c2d64593fbf3209cd5986cb684653d1092007add9d83910906b85e1801637206dd5fa5ce9627c6ada3a20a3a82ec5c2f4d7a
+  checksum: 238057b288f54401ad3fa8693c31ec08eef2d98a7fc93ce7f60bc009fcae18539e84be4c1cd41526816603f642f63444a7adce9d914b1338a53c0bf756bdb762
  languageName: node
  linkType: hard

@ -19803,7 +19837,7 @@ __metadata:
    core-js: 3.31.1
    css-loader: 6.8.1
    css-minimizer-webpack-plugin: 5.0.1
-    cypress: 12.15.0
+    cypress: 13.1.0
    cypress-file-upload: 5.0.8
    d3: 7.8.5
    d3-force: 3.0.0
@ -27460,6 +27494,15 @@ __metadata:
  languageName: node
  linkType: hard

+"qs@npm:6.10.4, qs@npm:~6.10.3":
+  version: 6.10.4
+  resolution: "qs@npm:6.10.4"
+  dependencies:
+    side-channel: ^1.0.4
+  checksum: 31e4fedd759d01eae52dde6692abab175f9af3e639993c5caaa513a2a3607b34d8058d3ae52ceeccf37c3025f22ed5e90e9ddd6c2537e19c0562ddd10dc5b1eb
+  languageName: node
+  linkType: hard
+
 "qs@npm:6.9.7":
  version: 6.9.7
  resolution: "qs@npm:6.9.7"
@ -27485,15 +27528,6 @@ __metadata:
  languageName: node
  linkType: hard

-"qs@npm:~6.10.3":
-  version: 6.10.4
-  resolution: "qs@npm:6.10.4"
-  dependencies:
-    side-channel: ^1.0.4
-  checksum: 31e4fedd759d01eae52dde6692abab175f9af3e639993c5caaa513a2a3607b34d8058d3ae52ceeccf37c3025f22ed5e90e9ddd6c2537e19c0562ddd10dc5b1eb
-  languageName: node
-  linkType: hard
-
 "qs@npm:~6.5.2":
  version: 6.5.3
  resolution: "qs@npm:6.5.3"
@ -32130,6 +32164,18 @@ __metadata:
  languageName: node
  linkType: hard

+"tough-cookie@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "tough-cookie@npm:4.1.3"
+  dependencies:
+    psl: ^1.1.33
+    punycode: ^2.1.1
+    universalify: ^0.2.0
+    url-parse: ^1.5.3
+  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
+  languageName: node
+  linkType: hard
+
 "tough-cookie@npm:~2.5.0":
  version: 2.5.0
  resolution: "tough-cookie@npm:2.5.0"