Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cypress: Remove docker execution cypress #755

Merged
merged 4 commits into from
Apr 25, 2023
Merged

cypress: Remove docker execution cypress #755

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f8e1f2
Remove docker support for Cypress
FriggaHel Apr 25, 2023
5d33fc2
Remove docker / mode from Cypress schema + Example
FriggaHel Apr 25, 2023
e04f575
Remove Docker Config field
FriggaHel Apr 25, 2023
6c416ee
Simplify
FriggaHel Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .sauce/cypress-10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ sauce:
build: "$BUILD_ID"
rootDir: tests/e2e/cypress_10/e2e/
defaults:
mode: sauce
timeout: 5m
docker:
fileTransfer: mount
cypress:
version: 12.6.0
configFile: "cypress.config.js"
Expand Down
11 changes: 0 additions & 11 deletions .sauce/cypress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,10 @@ sauce:
rootDir: tests/e2e/
defaults:
timeout: 5m
docker:
fileTransfer: mount
cypress:
version: 9.5.3
configFile: "cypress.json"
suites:
- name: "saucy test in docker"
mode: docker
browser: "chrome"
config:
env:
hello: world
testFiles: [ "**/*.*" ]
excludedTestFiles: []

- name: "saucy test in sauce"
browser: "chrome"
platformName: "Windows 10"
Expand Down
4 changes: 0 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ playwright-ci: build-linux
testcafe-ci: build-linux
docker run --name testcafe-ci -e "CI=true" -v $(shell pwd):/home/gitty/ -w "/home/gitty" --rm saucelabs/stt-testcafe-node:latest "/home/gitty/saucectl" run -c ./.sauce/testcafe.yml --verbose

#cypress-ci: @ Run tests against cypress in CI mode
cypress-ci: build-linux
docker run --name cypress-ci -e "CI=true" -v $(shell pwd):/home/gitty/ -w "/home/gitty" --rm saucelabs/stt-cypress-mocha-node:latest "/home/gitty/saucectl" run -c ./.sauce/cypress.yml --verbose

#schema: @ Build the json schema
schema:
$(eval INPUT_SCHEMA := $(shell pwd)/api/global.schema.json)
Expand Down
144 changes: 49 additions & 95 deletions api/saucectl.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,33 +85,6 @@
},
"additionalProperties": true
},
{
"$schema": "https://json-schema.org/draft-07/schema",
"title": "saucectl docker specific schema",
"description": "Subschema for docker specific settings",
"type": "object",
"properties": {
"docker": {
"description": "Properties specific to docker.",
"type": "object",
"properties": {
"fileTransfer": {
"description": "Control how files are made available to the docker image.",
"enum": [
"copy",
"mount"
]
},
"image": {
"description": "Override which docker image to use (in case you have a custom image).",
"type": "string"
}
},
"additionalProperties": false
}
},
"additionalProperties": true
},
{
"$schema": "https://json-schema.org/draft-07/schema",
"title": "saucectl npm specific schema",
Expand Down Expand Up @@ -306,13 +279,6 @@
"description": "Settings that are applied onto every suite by default, if no value is set on a suite explicitly.",
"type": "object",
"properties": {
"mode": {
"description": "Instructs saucectl run tests remotely through Sauce Labs (sauce) or locally on docker.",
"enum": [
"docker",
"sauce"
]
},
"timeout": {
"$ref": "#/allOf/9/then/definitions/suite/properties/timeout"
}
Expand Down Expand Up @@ -442,9 +408,6 @@
"testFiles"
]
},
"mode": {
"$ref": "#/allOf/0/then/properties/defaults/properties/mode"
},
"shard": {
"description": "When sharding is configured, saucectl automatically splits the tests (e.g. by spec or concurrency) so that they can easily run in parallel.",
"enum": [
Expand Down Expand Up @@ -558,33 +521,6 @@
},
"additionalProperties": true
},
{
"$schema": "https://json-schema.org/draft-07/schema",
"title": "saucectl docker specific schema",
"description": "Subschema for docker specific settings",
"type": "object",
"properties": {
"docker": {
"description": "Properties specific to docker.",
"type": "object",
"properties": {
"fileTransfer": {
"description": "Control how files are made available to the docker image.",
"enum": [
"copy",
"mount"
]
},
"image": {
"description": "Override which docker image to use (in case you have a custom image).",
"type": "string"
}
},
"additionalProperties": false
}
},
"additionalProperties": true
},
{
"$schema": "https://json-schema.org/draft-07/schema",
"title": "saucectl npm specific schema",
Expand Down Expand Up @@ -788,13 +724,6 @@
"description": "Settings that are applied onto every suite by default, if no value is set on a suite explicitly.",
"type": "object",
"properties": {
"mode": {
"description": "Instructs saucectl run tests remotely through Sauce Labs (sauce) or locally on docker.",
"enum": [
"docker",
"sauce"
]
},
"timeout": {
"description": "Instructs how long (in ms, s, m, or h) saucectl should wait for a suite to complete.",
"type": "string",
Expand Down Expand Up @@ -942,9 +871,6 @@
"specPattern"
]
},
"mode": {
"$ref": "#/allOf/1/then/properties/defaults/properties/mode"
},
"shard": {
"description": "When sharding is configured, saucectl automatically splits the tests (e.g. by spec or concurrency) so that they can easily run in parallel.",
"enum": [
Expand Down Expand Up @@ -1011,13 +937,13 @@
"type": "object",
"allOf": [
{
"$ref": "#/allOf/0/then/allOf/3"
"$ref": "#/allOf/0/then/allOf/2"
},
{
"$ref": "#/allOf/0/then/allOf/0"
},
{
"$ref": "#/allOf/0/then/allOf/4"
"$ref": "#/allOf/0/then/allOf/3"
}
],
"properties": {
Expand Down Expand Up @@ -1324,6 +1250,33 @@
{
"$ref": "#/allOf/0/then/allOf/0"
},
{
"$schema": "https://json-schema.org/draft-07/schema",
"title": "saucectl docker specific schema",
"description": "Subschema for docker specific settings",
"type": "object",
"properties": {
"docker": {
"description": "Properties specific to docker.",
"type": "object",
"properties": {
"fileTransfer": {
"description": "Control how files are made available to the docker image.",
"enum": [
"copy",
"mount"
]
},
"image": {
"description": "Override which docker image to use (in case you have a custom image).",
"type": "string"
}
},
"additionalProperties": false
}
},
"additionalProperties": true
},
{
"$ref": "#/allOf/0/then/allOf/1"
},
Expand All @@ -1332,9 +1285,6 @@
},
{
"$ref": "#/allOf/0/then/allOf/3"
},
{
"$ref": "#/allOf/0/then/allOf/4"
}
],
"properties": {
Expand All @@ -1352,7 +1302,11 @@
"type": "object",
"properties": {
"mode": {
"$ref": "#/allOf/0/then/properties/defaults/properties/mode"
"description": "Instructs saucectl run tests remotely through Sauce Labs (sauce) or locally on docker.",
"enum": [
"docker",
"sauce"
]
},
"timeout": {
"$ref": "#/allOf/9/then/definitions/suite/properties/timeout"
Expand Down Expand Up @@ -1408,7 +1362,7 @@
"type": "string"
},
"mode": {
"$ref": "#/allOf/0/then/properties/defaults/properties/mode"
"$ref": "#/allOf/3/then/properties/defaults/properties/mode"
},
"playwrightVersion": {
"$ref": "#/allOf/8/then/properties/playwright/properties/version"
Expand Down Expand Up @@ -1565,7 +1519,7 @@
"$ref": "#/allOf/0/then/allOf/0"
},
{
"$ref": "#/allOf/0/then/allOf/3"
"$ref": "#/allOf/0/then/allOf/2"
}
],
"properties": {
Expand Down Expand Up @@ -1662,6 +1616,9 @@
{
"$ref": "#/allOf/0/then/allOf/0"
},
{
"$ref": "#/allOf/3/then/allOf/1"
},
{
"$ref": "#/allOf/0/then/allOf/1"
},
Expand All @@ -1670,9 +1627,6 @@
},
{
"$ref": "#/allOf/0/then/allOf/3"
},
{
"$ref": "#/allOf/0/then/allOf/4"
}
],
"properties": {
Expand All @@ -1690,7 +1644,7 @@
"type": "object",
"properties": {
"mode": {
"$ref": "#/allOf/0/then/properties/defaults/properties/mode"
"$ref": "#/allOf/3/then/properties/defaults/properties/mode"
},
"timeout": {
"$ref": "#/allOf/9/then/definitions/suite/properties/timeout"
Expand Down Expand Up @@ -1793,7 +1747,7 @@
"$ref": "#/allOf/0/then/properties/env"
},
"mode": {
"$ref": "#/allOf/0/then/properties/defaults/properties/mode"
"$ref": "#/allOf/3/then/properties/defaults/properties/mode"
},
"shard": {
"description": "When sharding is configured, saucectl automatically splits the tests (e.g. by spec or concurrency) so that they can easily run in parallel.",
Expand Down Expand Up @@ -2039,13 +1993,13 @@
"type": "object",
"allOf": [
{
"$ref": "#/allOf/0/then/allOf/3"
"$ref": "#/allOf/0/then/allOf/2"
},
{
"$ref": "#/allOf/0/then/allOf/0"
},
{
"$ref": "#/allOf/0/then/allOf/4"
"$ref": "#/allOf/0/then/allOf/3"
}
],
"properties": {
Expand Down Expand Up @@ -2253,7 +2207,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/allOf/0/then/allOf/3"
"$ref": "#/allOf/0/then/allOf/2"
}
],
"properties": {
Expand Down Expand Up @@ -2328,6 +2282,9 @@
{
"$ref": "#/allOf/0/then/allOf/0"
},
{
"$ref": "#/allOf/3/then/allOf/1"
},
{
"$ref": "#/allOf/0/then/allOf/1"
},
Expand All @@ -2336,9 +2293,6 @@
},
{
"$ref": "#/allOf/0/then/allOf/3"
},
{
"$ref": "#/allOf/0/then/allOf/4"
}
],
"properties": {
Expand All @@ -2356,7 +2310,7 @@
"type": "object",
"properties": {
"mode": {
"$ref": "#/allOf/0/then/properties/defaults/properties/mode"
"$ref": "#/allOf/3/then/properties/defaults/properties/mode"
},
"timeout": {
"$ref": "#/allOf/9/then/definitions/suite/properties/timeout"
Expand Down Expand Up @@ -2469,7 +2423,7 @@
]
},
"mode": {
"$ref": "#/allOf/0/then/properties/defaults/properties/mode"
"$ref": "#/allOf/3/then/properties/defaults/properties/mode"
},
"shard": {
"description": "When sharding is configured, saucectl automatically splits the tests (e.g. by spec or concurrency) so that they can easily run in parallel.",
Expand Down
9 changes: 0 additions & 9 deletions api/v1/framework/cypress.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
{
"$ref": "../subschema/artifacts.schema.json"
},
{
"$ref": "../subschema/docker.schema.json"
},
{
"$ref": "../subschema/npm.schema.json"
},
Expand All @@ -34,9 +31,6 @@
"description": "Settings that are applied onto every suite by default, if no value is set on a suite explicitly.",
"type": "object",
"properties": {
"mode": {
"$ref": "../subschema/common.schema.json#/definitions/mode"
},
"timeout": {
"$ref": "../subschema/common.schema.json#/definitions/timeout"
}
Expand Down Expand Up @@ -173,9 +167,6 @@
"specPattern"
]
},
"mode": {
"$ref": "../subschema/common.schema.json#/definitions/mode"
},
"shard": {
"description": "When sharding is configured, saucectl automatically splits the tests (e.g. by spec or concurrency) so that they can easily run in parallel.",
"enum": [
Expand Down
7 changes: 0 additions & 7 deletions api/v1/subschema/common.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@
"description": "Set one or more environment variables. Values can be environment variables themselves. Not supported when running espresso/xcuitest!",
"type": "object"
},
"mode": {
"description": "Instructs saucectl run tests remotely through Sauce Labs (sauce) or locally on docker.",
"enum": [
"docker",
"sauce"
]
},
"orientation": {
"description": "The screen orientation to use.",
"enum": [
Expand Down
Loading