diff --git a/frontend/packages/console-telemetry-plugin/integration-tests/package.json b/frontend/packages/console-telemetry-plugin/integration-tests/package.json index e610b79e50c..8a5704c4c18 100644 --- a/frontend/packages/console-telemetry-plugin/integration-tests/package.json +++ b/frontend/packages/console-telemetry-plugin/integration-tests/package.json @@ -8,7 +8,7 @@ }, "scripts": { "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/*.feature\"", + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/*.feature\"", "test-cypress-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/*.feature\";" } } diff --git a/frontend/packages/dev-console/integration-tests/package.json b/frontend/packages/dev-console/integration-tests/package.json index 0a7d44ad6b0..605d641f98a 100644 --- a/frontend/packages/dev-console/integration-tests/package.json +++ b/frontend/packages/dev-console/integration-tests/package.json @@ -11,7 +11,7 @@ "clean-reports": "rm -rf ../../../gui_test_screenshots", "cypress-merge": "../../../node_modules/.bin/mochawesome-merge ../../../gui_test_screenshots/cypress_report*.json > ../../../gui_test_screenshots/cypress.json", "cypress-generate": "../../../node_modules/.bin/marge -o ../../../gui_test_screenshots/ -f cypress-report -t 'OpenShift DevConsole Cypress Test Results' -p 'OpenShift Cypress Test Results' --showPassed false --assetsDir ../../../gui_test_screenshots/cypress/assets ../../../gui_test_screenshots/cypress.json", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/e2e/enable-dev-perspective-ci.feature,features/e2e/add-flow-ci.feature\"; yarn posttest-cypress-headless", + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/e2e/enable-dev-perspective-ci.feature,features/e2e/add-flow-ci.feature\"; yarn posttest-cypress-headless", "test-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless", "test-cypress-nightly": "yarn run test-headless-all && yarn run cypress-merge && yarn run cypress-generate", "posttest-cypress-headless": "yarn run cypress-merge && yarn run cypress-generate" diff --git a/frontend/packages/helm-plugin/integration-tests/package.json b/frontend/packages/helm-plugin/integration-tests/package.json index fd3276bcaf0..5e87a8c9c72 100644 --- a/frontend/packages/helm-plugin/integration-tests/package.json +++ b/frontend/packages/helm-plugin/integration-tests/package.json @@ -8,7 +8,7 @@ }, "scripts": { "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/helm-release.feature\"", + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/helm-release.feature\"", "test-cypress-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless" } } diff --git a/frontend/packages/integration-tests/cypress-common-config.js b/frontend/packages/integration-tests/cypress-common-config.js index f7ab1666478..6896c7526ef 100644 --- a/frontend/packages/integration-tests/cypress-common-config.js +++ b/frontend/packages/integration-tests/cypress-common-config.js @@ -105,6 +105,7 @@ function setupNodeEvents(on, config) { /** @type {Cypress.ConfigOptions} */ const commonConfig = { + projectId: 'yfeyv6', viewportWidth: 1920, viewportHeight: 1080, defaultCommandTimeout: 40000, diff --git a/frontend/packages/integration-tests/package.json b/frontend/packages/integration-tests/package.json index 220a04c6336..e817b74fc8a 100644 --- a/frontend/packages/integration-tests/package.json +++ b/frontend/packages/integration-tests/package.json @@ -5,6 +5,6 @@ "private": true, "scripts": { "test-cypress": "cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron}" + "test-cypress-headless": "node --max-old-space-size=4096 ../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron}" } } diff --git a/frontend/packages/integration-tests/tests/app/admission-webhook-warning-notifications.cy.ts b/frontend/packages/integration-tests/tests/app/admission-webhook-warning-notifications.cy.ts index 1ab87be3785..a418150e6dd 100644 --- a/frontend/packages/integration-tests/tests/app/admission-webhook-warning-notifications.cy.ts +++ b/frontend/packages/integration-tests/tests/app/admission-webhook-warning-notifications.cy.ts @@ -7,7 +7,7 @@ const DEPLOY_NAME = 'deploy1'; const CONTAINER_NAME = 'container1'; const WARNING_FOO = '299 - "[pod-must-have-label-foo] you must provide labels: {"foo"}"'; const WARNING_BAR = '299 - "[deployment-must-have-label-bar] you must provide labels: {"bar"}"'; -const WAIT_OPTION = { requestTimeout: 5000 }; +const WAIT_OPTION = { timeout: 5000 }; const POD_CREATED_ALIAS = 'podCreated'; const BULK_RESOURCES_CREATED_ALIAS = 'bulkResourcesCreated'; const LEARN_MORE_ID = 'admission-webhook-warning-learn-more'; diff --git a/frontend/packages/integration-tests/tests/app/poll-console-updates.cy.ts b/frontend/packages/integration-tests/tests/app/poll-console-updates.cy.ts index 0da381c817a..a30ace746e7 100644 --- a/frontend/packages/integration-tests/tests/app/poll-console-updates.cy.ts +++ b/frontend/packages/integration-tests/tests/app/poll-console-updates.cy.ts @@ -39,7 +39,7 @@ const PLUGIN_MANIFEST_NEW_VERSION = { name: PLUGIN_NAME, version: '1.0.0', }; -const WAIT_OPTIONS = { requestTimeout: 300000 }; +const WAIT_OPTIONS = { timeout: 300000 }; const loadApp = () => { cy.visit('/'); diff --git a/frontend/packages/integration-tests/tests/cluster-settings/channel-modal.cy.ts b/frontend/packages/integration-tests/tests/cluster-settings/channel-modal.cy.ts index b3c7e8ac932..58da769551a 100644 --- a/frontend/packages/integration-tests/tests/cluster-settings/channel-modal.cy.ts +++ b/frontend/packages/integration-tests/tests/cluster-settings/channel-modal.cy.ts @@ -8,7 +8,7 @@ import { clusterSettings } from '../../views/cluster-settings'; const CHANNEL_CANDIDATE = 'candidate-4.16'; const CHANNEL_STABLE = 'stable-4.16'; const CLUSTER_VERSION_ALIAS = 'clusterVersion'; -const WAIT_OPTIONS = { requestTimeout: 300000 }; +const WAIT_OPTIONS = { timeout: 300000 }; describe('Cluster Settings channel modal', () => { before(() => { diff --git a/frontend/packages/integration-tests/tests/cluster-settings/update-in-progress.cy.ts b/frontend/packages/integration-tests/tests/cluster-settings/update-in-progress.cy.ts index 554b6f388fc..b2759df0782 100644 --- a/frontend/packages/integration-tests/tests/cluster-settings/update-in-progress.cy.ts +++ b/frontend/packages/integration-tests/tests/cluster-settings/update-in-progress.cy.ts @@ -3,7 +3,7 @@ import { checkErrors } from '../../support'; import { clusterSettings } from '../../views/cluster-settings'; const CLUSTER_VERSION_ALIAS = 'clusterVersion'; -const WAIT_OPTIONS = { requestTimeout: 300000 }; +const WAIT_OPTIONS = { timeout: 300000 }; describe('Cluster Settings while an update is in progress', () => { before(() => { diff --git a/frontend/packages/integration-tests/tests/cluster-settings/update-modal.cy.ts b/frontend/packages/integration-tests/tests/cluster-settings/update-modal.cy.ts index a6176cd5613..9b354793370 100644 --- a/frontend/packages/integration-tests/tests/cluster-settings/update-modal.cy.ts +++ b/frontend/packages/integration-tests/tests/cluster-settings/update-modal.cy.ts @@ -8,7 +8,7 @@ import { clusterSettings } from '../../views/cluster-settings'; import { isLocalDevEnvironment } from '../../views/common'; const CLUSTER_VERSION_ALIAS = 'clusterVersion'; -const WAIT_OPTIONS = { requestTimeout: 300000 }; +const WAIT_OPTIONS = { timeout: 300000 }; // Disabled due to createRoot concurrent rendering failures (OCPBUGS-82504) xdescribe('Cluster Settings cluster update modal', () => { diff --git a/frontend/packages/integration-tests/tests/cluster-settings/updates-graph.cy.ts b/frontend/packages/integration-tests/tests/cluster-settings/updates-graph.cy.ts index 0bddddac401..128f9637a2d 100644 --- a/frontend/packages/integration-tests/tests/cluster-settings/updates-graph.cy.ts +++ b/frontend/packages/integration-tests/tests/cluster-settings/updates-graph.cy.ts @@ -3,7 +3,7 @@ import { checkErrors } from '../../support'; import { clusterSettings } from '../../views/cluster-settings'; const CLUSTER_VERSION_ALIAS = 'clusterVersion'; -const WAIT_OPTIONS = { requestTimeout: 300000 }; +const WAIT_OPTIONS = { timeout: 300000 }; describe('Cluster Settings updates graph', () => { before(() => { diff --git a/frontend/packages/integration-tests/tests/cluster-settings/upgradeable-false.cy.ts b/frontend/packages/integration-tests/tests/cluster-settings/upgradeable-false.cy.ts index a15f4a361ce..a426120d7c7 100644 --- a/frontend/packages/integration-tests/tests/cluster-settings/upgradeable-false.cy.ts +++ b/frontend/packages/integration-tests/tests/cluster-settings/upgradeable-false.cy.ts @@ -3,7 +3,7 @@ import { checkErrors } from '../../support'; import { clusterSettings } from '../../views/cluster-settings'; const CLUSTER_VERSION_ALIAS = 'clusterVersion'; -const WAIT_OPTIONS = { requestTimeout: 300000 }; +const WAIT_OPTIONS = { timeout: 300000 }; describe('Cluster Settings when ClusterVersion Upgradeable=False', () => { before(() => { diff --git a/frontend/packages/integration-tests/tests/cluster-settings/worker-mcp-paused.cy.ts b/frontend/packages/integration-tests/tests/cluster-settings/worker-mcp-paused.cy.ts index e9435a9d72a..b3567cf68ed 100644 --- a/frontend/packages/integration-tests/tests/cluster-settings/worker-mcp-paused.cy.ts +++ b/frontend/packages/integration-tests/tests/cluster-settings/worker-mcp-paused.cy.ts @@ -3,7 +3,7 @@ import { checkErrors } from '../../support'; import { clusterSettings } from '../../views/cluster-settings'; const CLUSTER_VERSION_ALIAS = 'clusterVersion'; -const WAIT_OPTIONS = { requestTimeout: 300000 }; +const WAIT_OPTIONS = { timeout: 300000 }; describe('Cluster Settings when worker MachineConfigPool is paused', () => { before(() => { diff --git a/frontend/packages/knative-plugin/integration-tests/package.json b/frontend/packages/knative-plugin/integration-tests/package.json index 15d36127260..e926c8e22c9 100644 --- a/frontend/packages/knative-plugin/integration-tests/package.json +++ b/frontend/packages/knative-plugin/integration-tests/package.json @@ -8,7 +8,7 @@ }, "scripts": { "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/e2e/knative-ci.feature\"", + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/e2e/knative-ci.feature\"", "test-cypress-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless" } } diff --git a/frontend/packages/operator-lifecycle-manager/integration-tests/package.json b/frontend/packages/operator-lifecycle-manager/integration-tests/package.json index ac2a8c73f96..d5237b86a29 100644 --- a/frontend/packages/operator-lifecycle-manager/integration-tests/package.json +++ b/frontend/packages/operator-lifecycle-manager/integration-tests/package.json @@ -5,6 +5,6 @@ "private": true, "scripts": { "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless" + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless" } } diff --git a/frontend/packages/shipwright-plugin/integration-tests/package.json b/frontend/packages/shipwright-plugin/integration-tests/package.json index 9826c8edab6..1060bde7f1a 100644 --- a/frontend/packages/shipwright-plugin/integration-tests/package.json +++ b/frontend/packages/shipwright-plugin/integration-tests/package.json @@ -8,7 +8,7 @@ }, "scripts": { "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/e2e/shipwright-ci.feature\";", + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/e2e/shipwright-ci.feature\";", "test-cypress-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless" } } diff --git a/frontend/packages/topology/integration-tests/package.json b/frontend/packages/topology/integration-tests/package.json index 9d42ee0834a..92c69b19028 100644 --- a/frontend/packages/topology/integration-tests/package.json +++ b/frontend/packages/topology/integration-tests/package.json @@ -8,7 +8,7 @@ }, "scripts": { "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/topology-ci.feature\"", + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/topology-ci.feature\"", "test-cypress-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless" } } diff --git a/frontend/packages/webterminal-plugin/integration-tests/package.json b/frontend/packages/webterminal-plugin/integration-tests/package.json index 717ee216b8f..d0ca410c410 100644 --- a/frontend/packages/webterminal-plugin/integration-tests/package.json +++ b/frontend/packages/webterminal-plugin/integration-tests/package.json @@ -8,7 +8,7 @@ }, "scripts": { "test-cypress": "../../../node_modules/.bin/cypress open --env openshift=true", - "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/web-terminal/web-terminal-adminuser.feature\"", + "test-cypress-headless": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run ${CYPRESS_RECORD_KEY:+--record} --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/web-terminal/web-terminal-adminuser.feature\"", "test-cypress-headless-all": "node --max-old-space-size=4096 ../../../node_modules/.bin/cypress run --env openshift=true --browser ${BRIDGE_E2E_BROWSER_NAME:-electron} --headless --spec \"features/*/*.feature\";" } }