Merge pull request #17079 from izaac/ci/slim-cypress-deps

Automation - Use cypress/package.json for CI instead of the full monorepo

Author: izaac

cypress/jenkins/cypress.sh

@@ -1,13 +1,18 @@
 #!/bin/bash
 
 set -e
+trap 'echo "FAILED at line $LINENO: $BASH_COMMAND (exit $?)"' ERR
 
 # Source shared utilities relative to the script's location
 source "$(dirname "$0")/utils.sh"
 
 pwd
 cd "dashboard"
 
+# Use test deps from cypress/node_modules
+export NODE_PATH="${PWD}/cypress/node_modules:${NODE_PATH:-}"
+export PATH="${PWD}/cypress/node_modules/.bin:${PATH}"
+
 kubectl version --client=true
 kubectl get nodes
 
@@ -46,9 +51,9 @@ fi
 set +e
 
 if [ -n "$PERCY_TOKEN" ]; then
-	npx --no-install percy exec -q -- cypress run --browser chrome --config-file cypress/jenkins/cypress.config.jenkins.ts "${SPEC_ARG[@]}"
+	percy exec -q -- cypress run --browser chrome --config-file cypress/jenkins/cypress.config.jenkins.ts "${SPEC_ARG[@]}"
 else
-	npx --no-install cypress run --browser chrome --config-file cypress/jenkins/cypress.config.jenkins.ts "${SPEC_ARG[@]}"
+	cypress run --browser chrome --config-file cypress/jenkins/cypress.config.jenkins.ts "${SPEC_ARG[@]}"
 fi
 EXIT_CODE=$?
 set -e

cypress/jenkins/init.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+trap 'echo "FAILED at line $LINENO: $BASH_COMMAND (exit $?)"' ERR
 
 # Source shared utilities
 source cypress/jenkins/utils.sh

cypress/jenkins/run.sh

@@ -2,6 +2,7 @@
 
 shopt -s extglob
 set -e
+trap 'echo "FAILED at line $LINENO: $BASH_COMMAND (exit $?)"' ERR
 
 # Source the local configuration file to generate .env
 source cypress/jenkins/configure.sh
@@ -63,7 +64,7 @@ build_image() {
 	if [ "${target_branch}" != "master" ]; then
 		echo "Overlaying cypress/jenkins and dependencies from master onto ${target_branch}"
 		git fetch origin master
-		git checkout origin/master -- cypress/jenkins cypress/support package.json yarn.lock cypress.config.ts || true
+		git checkout origin/master -- cypress/jenkins cypress/package.json cypress/support/qase.ts package.json yarn.lock cypress.config.ts || true
 	fi
 	cd "${HOME}"
 
@@ -92,16 +93,24 @@ build_image() {
 	cd "${HOME}"/dashboard
 
 	npm install -g yarn@"${YARN_VERSION}"
-	yarn config set ignore-engines true --silent
 
-	yarn install --frozen-lockfile
+	# Install only test dependencies from cypress/package.json
+	# This skips the full dashboard monorepo (Vue, webpack, @rancher/components)
+	cd cypress
+	echo "Installing deps from $(pwd)/package.json"
+	yarn install
+	cd ..
+
+	# Symlink so Cypress 11 can resolve ts-node/typescript from the project root
+	# (Cypress uses require.resolve with { paths: [projectRoot] } which ignores NODE_PATH)
+	ln -sf cypress/node_modules node_modules
 
 	# Debugging node_modules
-	if [ -d "node_modules/cypress-multi-reporters" ]; then
-		echo "Reporter found in dashboard/node_modules"
+	if [ -d "cypress/node_modules/cypress-multi-reporters" ]; then
+		echo "Reporter found in cypress/node_modules"
 	else
-		echo "ERROR: Reporter NOT found in dashboard/node_modules"
-		for module_path in node_modules/*cypress*; do
+		echo "ERROR: Reporter NOT found in cypress/node_modules"
+		for module_path in cypress/node_modules/*cypress*; do
 			[ -e "${module_path}" ] || continue
 			basename "${module_path}"
 		done
@@ -234,7 +243,7 @@ elif [ "${RANCHER_TYPE:-existing}" = "recurring" ]; then
 fi
 
 cd "${HOME}/dashboard" || exit 1
-./node_modules/.bin/jrm "${HOME}/dashboard/results.xml" "cypress/jenkins/reports/junit/junit-*" || true
+./cypress/node_modules/.bin/jrm "${HOME}/dashboard/results.xml" "cypress/jenkins/reports/junit/junit-*" || true
 
 if [ -s "${HOME}/dashboard/results.xml" ]; then
 	echo "cypress_exit_code=${exit_code}"

cypress/package.json

@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@cypress/code-coverage": "3.10.4",
-    "@cypress/grep": "3.1.5",
+    "@cypress/grep": "4.1.1",
     "@cypress/vue": "5.0.5",
     "@cypress/webpack-dev-server": "3.4.1",
-    "@percy/cli": "1.30.7",
+    "@percy/cli": "1.31.8",
     "@percy/cypress": "3.1.6",
     "axe-core": "4.10.2",
     "axe-html-reporter": "2.2.11",
@@ -41,15 +41,22 @@
     "cypress-axe": "1.6.0",
     "cypress-delete-downloads-folder": "0.0.4",
     "cypress-mochawesome-reporter": "3.8.2",
+    "cypress-multi-reporters": "1.6.4",
+    "cypress-qase-reporter": "3.0.0",
     "cypress-real-events": "1.14.0",
     "cypress-terminal-report": "^7.2.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "sha.js": "^2.4.12"
-  },
-  "devDependencies": {
-    "typescript": "^5.9.3"
+    "find-test-names": "1.29.19",
+    "globby": "11.1.0",
+    "junit-report-merger": "9.0.3",
+    "mocha-junit-reporter": "2.2.1",
+    "sha.js": "^2.4.12",
+    "ts-node": "10.9.2",
+    "typescript": "^5.9.3",
+    "ws": "8.18.0"
   },
+  "devDependencies": {},
   "repository": {
     "type": "git",
     "url": "https://github.com/rancher/dashboard.git",