ci: clean up e2e debug tooling (#39374)

* ci: fix e2e debug output setup

See #39373 (comment).

- use correct unscoped paths for both `store_artifacts` and `store_test_results`
- create missing directories to avoid error noise

* ci: remove unused Cypress Cloud setup

It adds unnecessary noise and complexity to our CI config.

Author: serhalp

.circleci/config.yml

@@ -25,17 +25,13 @@ executors:
     docker:
       - image: "cypress/browsers:node-18.20.3-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1"
     environment:
-      # This is just used to construct unique `CYPRESS_GROUP_NAME`
-      E2E_NODE_VERSION: 18.6.0
       GATSBY_CPU_COUNT: 2
       VERBOSE: 1
 
   e2e22:
     docker:
       - image: "cypress/browsers:node-22.13.1-chrome-133.0.6943.53-1-ff-135.0-edge-132.0.2957.140-1"
     environment:
-      # This is just used to construct unique `CYPRESS_GROUP_NAME`
-      E2E_NODE_VERSION: 22.13.1
       GATSBY_CPU_COUNT: 2
       VERBOSE: 1
 
@@ -456,7 +452,6 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_PATH_PREFIX}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/path-prefix
 
@@ -568,7 +563,6 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_DEV_RUNTIME_REACT_18}"' >> "$BASH_ENV"
       # We use curl in this test suite but it isn't available in all images we use
       - run: apt-get update && apt-get install -y curl
       - e2e-test:
@@ -582,11 +576,9 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CY_CLOUD_PROD_RUNTIME_OFFLINE_REACT_18="${CY_CLOUD_PROD_RUNTIME_OFFLINE_REACT_18}"' >> "$BASH_ENV"
-      - run: echo 'export CY_CLOUD_PROD_RUNTIME_REACT_18="${CY_CLOUD_PROD_RUNTIME_REACT_18}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/production-runtime
-          test_command: CYPRESS_PROJECT_ID=5k8zbj CYPRESS_RECORD_KEY=${CY_CLOUD_PROD_RUNTIME_REACT_18} yarn test && CYPRESS_PROJECT_ID=yvdct2 CYPRESS_RECORD_KEY=${CY_CLOUD_PROD_RUNTIME_OFFLINE_REACT_18} yarn test:offline
+          test_command: yarn test && yarn test:offline
 
   themes_e2e_tests_development_runtime:
     parameters:
@@ -596,7 +588,6 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_THEMES_DEV_RUNTIME}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/themes
           test_command: cd development-runtime; gatsby-dev --force-install --scan-once; yarn test
@@ -609,7 +600,6 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_THEMES_PROD_RUNTIME}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/themes
           test_command: cd production-runtime; gatsby-dev --force-install --scan-once; yarn test
@@ -622,7 +612,6 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_MDX}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/mdx
 
@@ -634,13 +623,12 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_VISUAL_REGRESSION}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/visual-regression
       - store_artifacts:
-          path: e2e-tests/visual-regression/<< parameters.e2e_executor_suffix >>/__diff_output__
+          path: e2e-tests/visual-regression/__diff_output__
       - store_test_results:
-          path: e2e-tests/visual-regression/cypress/<< parameters.e2e_executor_suffix >>/results
+          path: e2e-tests/visual-regression/cypress/results
 
   e2e_tests_contentful:
     parameters:
@@ -650,17 +638,16 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_CONTENTFUL}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/contentful
       # we build a second time to see if warm/cached builds are successful
       - e2e-test:
           test_path: e2e-tests/contentful
           test_command: yarn build
       - store_artifacts:
-          path: e2e-tests/contentful/<< parameters.e2e_executor_suffix >>/__diff_output__
+          path: e2e-tests/contentful/__diff_output__
       - store_test_results:
-          path: e2e-tests/contentful/cypress/<< parameters.e2e_executor_suffix >>/results
+          path: e2e-tests/contentful/cypress/results
 
   e2e_tests_trailing-slash:
     parameters:
@@ -670,11 +657,10 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_TRAILING_SLASH}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/trailing-slash
       - store_test_results:
-          path: e2e-tests/trailing-slash/cypress/<< parameters.e2e_executor_suffix >>/results
+          path: e2e-tests/trailing-slash/cypress/results
 
   e2e_tests_adapters:
     parameters:
@@ -684,11 +670,10 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_ADAPTERS}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/adapters
       - store_test_results:
-          path: e2e-tests/adapters/cypress/<< parameters.e2e_executor_suffix >>/results
+          path: e2e-tests/adapters/cypress/results
 
   e2e_tests_adapters_monorepo:
     parameters:
@@ -698,13 +683,12 @@ jobs:
         type: string
     executor: e2e<< parameters.e2e_executor_suffix >>
     steps:
-      - run: echo 'export CYPRESS_RECORD_KEY="${CY_CLOUD_ADAPTERS}"' >> "$BASH_ENV"
       - e2e-test:
           test_path: e2e-tests/adapters
           test_command: cd workspace; gatsby-dev --force-install --scan-once; cd ..; yarn test
           pre_gatsby_dev_command: ./make-monorepo.sh
       - store_test_results:
-          path: e2e-tests/adapters/cypress/<< parameters.e2e_executor_suffix >>/results
+          path: e2e-tests/adapters/cypress/results
 
   starters_validate:
     executor: node

e2e-tests/adapters/cypress/results/.gitkeep

@@ -17,8 +17,5 @@ echo '{ "workspaces": ["workspace"], "scripts": { "test": "EXTRA_NTL_CLI_ARGS=\"
 # update netlify.toml build command and publish dir
 sed -i.bak -e 's/npm run build/npm run build -w workspace/g' -e 's/public/workspace\/public/g' workspace/netlify.toml
 
-# update workspace's package.json to have correct path to helper script after moving site fixture into subdirectory
-sed -i.bak -e 's/..\/..\/scripts\/cypress-run-with-conditional-record-flag.js/..\/..\/..\/scripts\/cypress-run-with-conditional-record-flag.js/g' workspace/package.json
-
 git init
 

e2e-tests/adapters/make-monorepo.sh

@@ -13,8 +13,8 @@
     "cy:open": "cypress open --browser chrome --e2e",
     "develop:debug": "start-server-and-test develop http://localhost:8000 'npm run cy:open -- --config baseUrl=http://localhost:8000'",
     "ssat:debug": "start-server-and-test serve http://localhost:9000 cy:open",
-    "test:template": "cross-env-shell CYPRESS_GROUP_NAME=\"adapter:$ADAPTER nodejs:$E2E_NODE_VERSION / trailingSlash:${TRAILING_SLASH:-always} / pathPrefix:${PATH_PREFIX:--}  / excludeDatastoreFromBundle:${GATSBY_EXCLUDE_DATASTORE_FROM_BUNDLE:-false} / monorepo:${E2E_MONOREPO:-false}\" TRAILING_SLASH=$TRAILING_SLASH PATH_PREFIX=$PATH_PREFIX node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file \"cypress/configs/$ADAPTER.ts\" --env TRAILING_SLASH=$TRAILING_SLASH,PATH_PREFIX=$PATH_PREFIX",
-    "test:template:debug": "cross-env-shell CYPRESS_GROUP_NAME=\"adapter:$ADAPTER nodejs:$E2E_NODE_VERSION / trailingSlash:${TRAILING_SLASH:-always} / pathPrefix:${PATH_PREFIX:--} / excludeDatastoreFromBundle:${GATSBY_EXCLUDE_DATASTORE_FROM_BUNDLE:-false} / monorepo:${E2E_MONOREPO:-false}\" TRAILING_SLASH=$TRAILING_SLASH PATH_PREFIX=$PATH_PREFIX npm run cy:open -- --config-file \"cypress/configs/$ADAPTER.ts\" --env TRAILING_SLASH=$TRAILING_SLASH,PATH_PREFIX=$PATH_PREFIX",
+    "test:template": "cross-env-shell TRAILING_SLASH=$TRAILING_SLASH PATH_PREFIX=$PATH_PREFIX cypress run --browser chrome --e2e --config-file \"cypress/configs/$ADAPTER.ts\" --env TRAILING_SLASH=$TRAILING_SLASH,PATH_PREFIX=$PATH_PREFIX",
+    "test:template:debug": "cross-env-shell TRAILING_SLASH=$TRAILING_SLASH PATH_PREFIX=$PATH_PREFIX npm run cy:open -- --config-file \"cypress/configs/$ADAPTER.ts\" --env TRAILING_SLASH=$TRAILING_SLASH,PATH_PREFIX=$PATH_PREFIX",
     "test:debug": "npm-run-all -s build:debug ssat:debug",
     "test:netlify": "cross-env TRAILING_SLASH=always node scripts/deploy-and-run/netlify.mjs test:template",
     "test:smoke": "node smoke-test.mjs",

e2e-tests/adapters/package.json

@@ -42,7 +42,7 @@
     "start-server-and-test": "start-server-and-test serve http://localhost:9000 cy:run",
     "serve": "gatsby serve",
     "cy:open": "cypress open --browser chrome --e2e",
-    "cy:run": "node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e"
+    "cy:run": "cypress run --browser chrome --e2e"
   },
   "repository": {
     "type": "git",

e2e-tests/contentful/cypress/results/.gitkeep

@@ -50,7 +50,7 @@
     "start-server-and-test": "start-server-and-test develop http://localhost:8000 serve-static-files http://localhost:8888 combined",
     "start-server-and-test:locally": "start-server-and-test develop http://localhost:8000 serve-static-files http://localhost:8888 cy:open",
     "cy:open": "cypress open --browser chrome --e2e",
-    "cy:run": "node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e",
+    "cy:run": "cypress run --browser chrome --e2e",
     "playwright": "playwright test --project=chromium",
     "playwright:debug": "playwright test --project=chromium --debug",
     "start-server-and-test:playwright": "start-server-and-test develop http://localhost:8000 serve-static-files http://localhost:8888 playwright",

e2e-tests/contentful/package.json

@@ -38,8 +38,8 @@
     "serve": "gatsby serve",
     "cy:open:develop": "cypress open --browser chrome --e2e --config-file cypress/configs/develop.ts",
     "cy:open:build": "cypress open --browser chrome --e2e --config-file cypress/configs/build.ts",
-    "cy:run:build": "CYPRESS_GROUP_NAME=production:$E2E_NODE_VERSION node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file cypress/configs/build.ts",
-    "cy:run:develop": "CYPRESS_GROUP_NAME=development:$E2E_NODE_VERSION node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config-file cypress/configs/develop.ts",
+    "cy:run:build": "cypress run --browser chrome --e2e --config-file cypress/configs/build.ts",
+    "cy:run:develop": "cypress run --browser chrome --e2e --config-file cypress/configs/develop.ts",
     "reset": "node scripts/reset.js",
     "update": "node scripts/update.js"
   },

e2e-tests/development-runtime/package.json

@@ -35,7 +35,7 @@
     "serve:site": "gatsby serve --prefix-paths",
     "serve:assets": "node scripts/serve.js",
     "cy:open": "cypress open --browser chrome --e2e",
-    "cy:run": "node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e"
+    "cy:run": "cypress run --browser chrome --e2e"
   },
   "devDependencies": {
     "cpy-cli": "^4.2.0",

e2e-tests/mdx/package.json

@@ -45,8 +45,8 @@
     "cy:open:offline": "npm run cy:open -- --env TEST_PLUGIN_OFFLINE=y",
     "cy:run": "npm run cy:run:normal && npm run cy:run:bot",
     "cy:run:offline": "npm run cy:run:normal -- --env TEST_PLUGIN_OFFLINE=y",
-    "cy:run:normal": "node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e",
-    "cy:run:bot": "cross-env CYPRESS_CONNECTION_TYPE=bot node ../../scripts/cypress-run-with-conditional-record-flag.js --browser chrome --e2e --config specPattern=\"cypress/integration/prefetching.js\"",
+    "cy:run:normal": "cypress run --browser chrome --e2e",
+    "cy:run:bot": "cross-env CYPRESS_CONNECTION_TYPE=bot cypress run --browser chrome --e2e --config specPattern=\"cypress/integration/prefetching.js\"",
     "playwright": "playwright test --project=chromium",
     "playwright:debug": "playwright test --project=chromium --debug",
     "start-server-and-test:playwright": "start-server-and-test serve http://localhost:9000 serve-static-files http://localhost:8888 playwright",