From 3374c4e2d43f9c27cf25857d76cd05244e4083df Mon Sep 17 00:00:00 2001 From: Tomasz Konieczny Date: Thu, 6 Jul 2023 10:48:34 +0200 Subject: [PATCH] Testsuites switched to CRDs and v3, run script updated, k6 test fixed after workingdir changes --- test/k6/executor-tests/crd/other.yaml | 2 +- test/scripts/executor-tests/run.sh | 44 ++++++----- .../executor-artillery-smoke-tests.json | 8 -- .../executor-artillery-smoke-tests.yaml | 12 +++ .../executor-container-curl-smoke-tests.json | 8 -- .../executor-container-curl-smoke-tests.yaml | 16 ++++ ...xecutor-container-cypress-smoke-tests.json | 8 -- ...xecutor-container-cypress-smoke-tests.yaml | 16 ++++ .../executor-container-k6-smoke-tests.json | 8 -- .../executor-container-k6-smoke-tests.yaml | 16 ++++ ...utor-container-playwright-smoke-tests.json | 7 -- ...utor-container-playwright-smoke-tests.yaml | 13 ++++ test/suites/executor-curl-smoke-tests.json | 8 -- test/suites/executor-curl-smoke-tests.yaml | 16 ++++ test/suites/executor-cypress-smoke-tests.json | 28 ------- test/suites/executor-cypress-smoke-tests.yaml | 76 +++++++++++++++++++ test/suites/executor-ginkgo-smoke-tests.json | 8 -- test/suites/executor-ginkgo-smoke-tests.yaml | 16 ++++ test/suites/executor-gradle-smoke-tests.json | 11 --- test/suites/executor-gradle-smoke-tests.yaml | 25 ++++++ test/suites/executor-jmeter-smoke-tests.json | 10 --- test/suites/executor-jmeter-smoke-tests.yaml | 22 ++++++ test/suites/executor-k6-other-tests.json | 7 -- test/suites/executor-k6-other-tests.yaml | 13 ++++ test/suites/executor-k6-smoke-tests.json | 9 --- test/suites/executor-k6-smoke-tests.yaml | 19 +++++ test/suites/executor-kubepug-smoke-tests.json | 8 -- test/suites/executor-kubepug-smoke-tests.yaml | 16 ++++ test/suites/executor-maven-smoke-tests.json | 9 --- test/suites/executor-maven-smoke-tests.yaml | 19 +++++ .../executor-playwright-smoke-tests.json | 7 -- .../executor-playwright-smoke-tests.yaml | 13 ++++ test/suites/executor-postman-smoke-tests.json | 12 --- test/suites/executor-postman-smoke-tests.yaml | 28 +++++++ test/suites/executor-soapui-smoke-tests.json | 8 -- test/suites/executor-soapui-smoke-tests.yaml | 16 ++++ 36 files changed, 377 insertions(+), 185 deletions(-) delete mode 100644 test/suites/executor-artillery-smoke-tests.json create mode 100644 test/suites/executor-artillery-smoke-tests.yaml delete mode 100644 test/suites/executor-container-curl-smoke-tests.json create mode 100644 test/suites/executor-container-curl-smoke-tests.yaml delete mode 100644 test/suites/executor-container-cypress-smoke-tests.json create mode 100644 test/suites/executor-container-cypress-smoke-tests.yaml delete mode 100644 test/suites/executor-container-k6-smoke-tests.json create mode 100644 test/suites/executor-container-k6-smoke-tests.yaml delete mode 100644 test/suites/executor-container-playwright-smoke-tests.json create mode 100644 test/suites/executor-container-playwright-smoke-tests.yaml delete mode 100644 test/suites/executor-curl-smoke-tests.json create mode 100644 test/suites/executor-curl-smoke-tests.yaml delete mode 100644 test/suites/executor-cypress-smoke-tests.json create mode 100644 test/suites/executor-cypress-smoke-tests.yaml delete mode 100644 test/suites/executor-ginkgo-smoke-tests.json create mode 100644 test/suites/executor-ginkgo-smoke-tests.yaml delete mode 100644 test/suites/executor-gradle-smoke-tests.json create mode 100644 test/suites/executor-gradle-smoke-tests.yaml delete mode 100644 test/suites/executor-jmeter-smoke-tests.json create mode 100644 test/suites/executor-jmeter-smoke-tests.yaml delete mode 100644 test/suites/executor-k6-other-tests.json create mode 100644 test/suites/executor-k6-other-tests.yaml delete mode 100644 test/suites/executor-k6-smoke-tests.json create mode 100644 test/suites/executor-k6-smoke-tests.yaml delete mode 100644 test/suites/executor-kubepug-smoke-tests.json create mode 100644 test/suites/executor-kubepug-smoke-tests.yaml delete mode 100644 test/suites/executor-maven-smoke-tests.json create mode 100644 test/suites/executor-maven-smoke-tests.yaml delete mode 100644 test/suites/executor-playwright-smoke-tests.json create mode 100644 test/suites/executor-playwright-smoke-tests.yaml delete mode 100644 test/suites/executor-postman-smoke-tests.json create mode 100644 test/suites/executor-postman-smoke-tests.yaml delete mode 100644 test/suites/executor-soapui-smoke-tests.json create mode 100644 test/suites/executor-soapui-smoke-tests.yaml diff --git a/test/k6/executor-tests/crd/other.yaml b/test/k6/executor-tests/crd/other.yaml index b36d2fb6c15..5a1209c7f91 100644 --- a/test/k6/executor-tests/crd/other.yaml +++ b/test/k6/executor-tests/crd/other.yaml @@ -24,4 +24,4 @@ spec: args: - -e - K6_ENV_FROM_PARAM=K6_ENV_FROM_PARAM_value - - test/k6/executor-tests/k6-smoke-test.js # should be possible to remove path after working_dir feature \ No newline at end of file + - k6-smoke-test.js \ No newline at end of file diff --git a/test/scripts/executor-tests/run.sh b/test/scripts/executor-tests/run.sh index 97f3f710fb7..d7bc7ce96e1 100755 --- a/test/scripts/executor-tests/run.sh +++ b/test/scripts/executor-tests/run.sh @@ -32,7 +32,7 @@ print_title() { printf "\n$border\n=== $1\n$border\n" } -create_update_testsuite() { # testsuite_name testsuite_path +create_update_testsuite_json() { # testsuite_name testsuite_path exit_code=0 type="" kubectl testkube get testsuite $1 > /dev/null 2>&1 || exit_code=$? @@ -51,6 +51,10 @@ create_update_testsuite() { # testsuite_name testsuite_path fi } +create_update_testsuite() { # testsuite_path + kubectl apply -f $1 +} + run_follow_testsuite() { # testsuite_name follow_param='' if [ "$follow" = true ] ; then @@ -92,7 +96,7 @@ common_run() { # name, test_crd_file, testsuite_name, testsuite_file, custom_exe kubectl apply -f $test_crd_file # TestsSuites - create_update_testsuite "$testsuite_name" "$testsuite_file" + create_update_testsuite "$testsuite_file" fi if [ "$run" = true ] && [ "$custom_testsuite" = '' ]; then @@ -104,7 +108,7 @@ artillery-smoke() { name="artillery" test_crd_file="test/artillery/executor-smoke/crd/crd.yaml" testsuite_name="executor-artillery-smoke-tests" - testsuite_file="test/suites/executor-artillery-smoke-tests.json" + testsuite_file="test/suites/executor-artillery-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -113,7 +117,7 @@ container-curl-smoke() { name="Container executor - Curl" test_crd_file="test/container-executor/executor-smoke/crd/curl.yaml" testsuite_name="executor-container-curl-smoke-tests" - testsuite_file="test/suites/executor-container-curl-smoke-tests.json" + testsuite_file="test/suites/executor-container-curl-smoke-tests.yaml" custom_executor_crd_file="test/executors/container-executor-curl.yaml" @@ -124,7 +128,7 @@ container-cypress-smoke() { name="Container executor - Cypress" test_crd_file="test/container-executor/executor-smoke/crd/cypress.yaml" testsuite_name="executor-container-cypress-smoke-tests" - testsuite_file="test/suites/executor-container-cypress-smoke-tests.json" + testsuite_file="test/suites/executor-container-cypress-smoke-tests.yaml" custom_executor_crd_file="test/executors/container-executor-cypress.yaml" @@ -135,7 +139,7 @@ container-k6-smoke() { name="Container executor - K6" test_crd_file="test/container-executor/executor-smoke/crd/k6.yaml" testsuite_name="executor-container-k6-smoke-tests" - testsuite_file="test/suites/executor-container-k6-smoke-tests.json" + testsuite_file="test/suites/executor-container-k6-smoke-tests.yaml" custom_executor_crd_file="test/executors/container-executor-k6.yaml" @@ -146,7 +150,7 @@ container-playwright-smoke() { name="Container executor - Playwright" test_crd_file="test/container-executor/executor-smoke/crd/playwright.yaml" testsuite_name="executor-container-playwright-smoke-tests" - testsuite_file="test/suites/executor-container-playwright-smoke-tests.json" + testsuite_file="test/suites/executor-container-playwright-smoke-tests.yaml" custom_executor_crd_file="test/executors/container-executor-playwright.yaml" @@ -157,7 +161,7 @@ curl-smoke() { name="curl" test_crd_file="test/curl/executor-tests/crd/smoke.yaml" testsuite_name="executor-curl-smoke-tests" - testsuite_file="test/suites/executor-curl-smoke-tests.json" + testsuite_file="test/suites/executor-curl-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -166,7 +170,7 @@ cypress-smoke() { name="Cypress" test_crd_file="test/cypress/executor-tests/crd/crd.yaml" testsuite_name="executor-cypress-smoke-tests" - testsuite_file="test/suites/executor-cypress-smoke-tests.json" + testsuite_file="test/suites/executor-cypress-smoke-tests.yaml" custom_executor_crd_file="test/executors/cypress.yaml" @@ -177,7 +181,7 @@ ginkgo-smoke() { name="Ginkgo" test_crd_file="test/ginkgo/executor-tests/crd/smoke.yaml" testsuite_name="executor-ginkgo-smoke-tests" - testsuite_file="test/suites/executor-ginkgo-smoke-tests.json" + testsuite_file="test/suites/executor-ginkgo-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -186,7 +190,7 @@ gradle-smoke() { name="Gradle" test_crd_file="test/gradle/executor-smoke/crd/crd.yaml" testsuite_name="executor-gradle-smoke-tests" - testsuite_file="test/suites/executor-gradle-smoke-tests.json" + testsuite_file="test/suites/executor-gradle-smoke-tests.yaml" custom_executor_crd_file="test/executors/gradle.yaml" @@ -197,7 +201,7 @@ jmeter-smoke() { name="JMeter" test_crd_file="test/jmeter/executor-tests/crd/smoke.yaml" testsuite_name="executor-jmeter-smoke-tests" - testsuite_file="test/suites/executor-jmeter-smoke-tests.json" + testsuite_file="test/suites/executor-jmeter-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -206,7 +210,7 @@ k6-smoke() { name="k6 smoke" test_crd_file="test/k6/executor-tests/crd/smoke.yaml" testsuite_name="executor-k6-smoke-tests" - testsuite_file="test/suites/executor-k6-smoke-tests.json" + testsuite_file="test/suites/executor-k6-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -215,7 +219,7 @@ k6-other() { name="k6 other" test_crd_file="test/k6/executor-tests/crd/other.yaml" testsuite_name="executor-k6-other-tests" - testsuite_file="test/suites/executor-k6-other-tests.json" + testsuite_file="test/suites/executor-k6-other-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -224,7 +228,7 @@ kubepug-smoke() { name="kubepug" test_crd_file="test/kubepug/executor-smoke/crd/crd.yaml" testsuite_name="executor-kubepug-smoke-tests" - testsuite_file="test/suites/executor-kubepug-smoke-tests.json" + testsuite_file="test/suites/executor-kubepug-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -233,7 +237,7 @@ maven-smoke() { name="Maven" test_crd_file="test/maven/executor-smoke/crd/crd.yaml" testsuite_name="executor-maven-smoke-tests" - testsuite_file="test/suites/executor-maven-smoke-tests.json" + testsuite_file="test/suites/executor-maven-smoke-tests.yaml" custom_executor_crd_file="test/executors/maven.yaml" @@ -244,7 +248,7 @@ playwright-smoke() { name="playwright" test_crd_file="test/playwright/executor-tests/crd/crd.yaml" testsuite_name="executor-playwright-smoke-tests" - testsuite_file="test/suites/executor-playwright-smoke-tests.json" + testsuite_file="test/suites/executor-playwright-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -253,7 +257,7 @@ postman-smoke() { name="postman" test_crd_file="test/postman/executor-tests/crd/crd.yaml" testsuite_name="executor-postman-smoke-tests" - testsuite_file="test/suites/executor-postman-smoke-tests.json" + testsuite_file="test/suites/executor-postman-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -262,7 +266,7 @@ soapui-smoke() { name="SoapUI" test_crd_file="test/soapui/executor-smoke/crd/crd.yaml" testsuite_name="executor-soapui-smoke-tests" - testsuite_file="test/suites/executor-soapui-smoke-tests.json" + testsuite_file="test/suites/executor-soapui-smoke-tests.yaml" common_run "$name" "$test_crd_file" "$testsuite_name" "$testsuite_file" } @@ -315,7 +319,7 @@ main() { filename=$(basename $custom_testsuite) testsuite_name="${filename%%.*}" - create_update_testsuite "$testsuite_name" "$custom_testsuite" + create_update_testsuite "$custom_testsuite" run_follow_testsuite "$testsuite_name" fi } diff --git a/test/suites/executor-artillery-smoke-tests.json b/test/suites/executor-artillery-smoke-tests.json deleted file mode 100644 index 636929de44b..00000000000 --- a/test/suites/executor-artillery-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-artillery-smoke-tests", - "description": "artillery executor smoke tests", - "steps": [ - {"execute": [{"test": "artillery-executor-smoke"}]}, - {"execute": [{"test": "artillery-executor-smoke-negative"}]} - ] -} diff --git a/test/suites/executor-artillery-smoke-tests.yaml b/test/suites/executor-artillery-smoke-tests.yaml new file mode 100644 index 00000000000..daf63c5eee4 --- /dev/null +++ b/test/suites/executor-artillery-smoke-tests.yaml @@ -0,0 +1,12 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-artillery-smoke-tests + namespace: testkube +spec: + description: artillery executor smoke tests + steps: + - stopOnFailure: false + execute: + - test: artillery-executor-smoke + - test: artillery-executor-smoke-negative \ No newline at end of file diff --git a/test/suites/executor-container-curl-smoke-tests.json b/test/suites/executor-container-curl-smoke-tests.json deleted file mode 100644 index ed18762d5f4..00000000000 --- a/test/suites/executor-container-curl-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-container-curl-smoke-tests", - "description": "container executor curl smoke tests", - "steps": [ - {"execute": [{"test": "container-executor-curl-smoke"}]}, - {"execute": [{"test": "container-executor-curl-smoke-negative"}]} - ] -} diff --git a/test/suites/executor-container-curl-smoke-tests.yaml b/test/suites/executor-container-curl-smoke-tests.yaml new file mode 100644 index 00000000000..336e1b51015 --- /dev/null +++ b/test/suites/executor-container-curl-smoke-tests.yaml @@ -0,0 +1,16 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-container-curl-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "container executor curl smoke tests" + steps: + - stopOnFailure: false + execute: + - test: container-executor-curl-smoke + - stopOnFailure: false + execute: + - test: container-executor-curl-smoke-negative diff --git a/test/suites/executor-container-cypress-smoke-tests.json b/test/suites/executor-container-cypress-smoke-tests.json deleted file mode 100644 index 4ed1ecacdc5..00000000000 --- a/test/suites/executor-container-cypress-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-container-cypress-smoke-tests", - "description": "container executor cypress smoke tests", - "steps": [ - {"execute": {"name": "container-executor-cypress-v12.7.0-smoke"}}, - {"execute": {"name": "container-executor-cypress-v12.7.0-smoke-git-dir"}} - ] -} diff --git a/test/suites/executor-container-cypress-smoke-tests.yaml b/test/suites/executor-container-cypress-smoke-tests.yaml new file mode 100644 index 00000000000..aaa5ab94c19 --- /dev/null +++ b/test/suites/executor-container-cypress-smoke-tests.yaml @@ -0,0 +1,16 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-container-cypress-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "container executor cypress smoke tests" + steps: + - stopOnFailure: false + execute: + - test: container-executor-cypress-v12.7.0-smoke + - stopOnFailure: false + execute: + - test: container-executor-cypress-v12.7.0-smoke-git-dir diff --git a/test/suites/executor-container-k6-smoke-tests.json b/test/suites/executor-container-k6-smoke-tests.json deleted file mode 100644 index 648da8d7e3e..00000000000 --- a/test/suites/executor-container-k6-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-container-k6-smoke-tests", - "description": "container executor k6 smoke tests", - "steps": [ - {"execute": {"name": "container-executor-k6-smoke"}}, - {"execute": {"name": "container-executor-k6-smoke-git-file"}} - ] -} diff --git a/test/suites/executor-container-k6-smoke-tests.yaml b/test/suites/executor-container-k6-smoke-tests.yaml new file mode 100644 index 00000000000..9fc8b96f66f --- /dev/null +++ b/test/suites/executor-container-k6-smoke-tests.yaml @@ -0,0 +1,16 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-container-k6-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "container executor k6 smoke tests" + steps: + - stopOnFailure: false + execute: + - test: container-executor-k6-smoke + - stopOnFailure: false + execute: + - test: container-executor-k6-smoke-git-file diff --git a/test/suites/executor-container-playwright-smoke-tests.json b/test/suites/executor-container-playwright-smoke-tests.json deleted file mode 100644 index e53eff57095..00000000000 --- a/test/suites/executor-container-playwright-smoke-tests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "executor-container-playwright-smoke-tests", - "description": "container executor playwright smoke tests", - "steps": [ - {"execute": {"name": "container-executor-playwright-smoke"}} - ] -} diff --git a/test/suites/executor-container-playwright-smoke-tests.yaml b/test/suites/executor-container-playwright-smoke-tests.yaml new file mode 100644 index 00000000000..1caa440d130 --- /dev/null +++ b/test/suites/executor-container-playwright-smoke-tests.yaml @@ -0,0 +1,13 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-container-playwright-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "container executor playwright smoke tests" + steps: + - stopOnFailure: false + execute: + - test: container-executor-playwright-smoke diff --git a/test/suites/executor-curl-smoke-tests.json b/test/suites/executor-curl-smoke-tests.json deleted file mode 100644 index 60e692932bf..00000000000 --- a/test/suites/executor-curl-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-curl-smoke-tests", - "description": "curl executor smoke tests", - "steps": [ - {"execute": [{"test": "curl-executor-smoke"}]}, - {"execute": [{"test": "curl-executor-smoke-negative"}]} - ] -} diff --git a/test/suites/executor-curl-smoke-tests.yaml b/test/suites/executor-curl-smoke-tests.yaml new file mode 100644 index 00000000000..dd61850b8b7 --- /dev/null +++ b/test/suites/executor-curl-smoke-tests.yaml @@ -0,0 +1,16 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-curl-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "curl executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: curl-executor-smoke + - stopOnFailure: false + execute: + - test: curl-executor-smoke-negative diff --git a/test/suites/executor-cypress-smoke-tests.json b/test/suites/executor-cypress-smoke-tests.json deleted file mode 100644 index fdac64cacf2..00000000000 --- a/test/suites/executor-cypress-smoke-tests.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "executor-cypress-smoke-tests", - "description": "Cypress executor smoke tests", - "steps": [ - {"execute": [{"test": "cypress-12-executor-smoke-electron"}]}, - {"execute": [{"test": "cypress-12-executor-smoke-chrome"}]}, - {"execute": [{"test": "cypress-12-executor-smoke-firefox"}]}, - {"execute": [{"test": "cypress-11-executor-smoke-electron"}]}, - {"execute": [{"test": "cypress-11-executor-smoke-chrome"}]}, - {"execute": [{"test": "cypress-11-executor-smoke-firefox"}]}, - {"execute": [{"test": "cypress-10-executor-smoke-electron"}]}, - {"execute": [{"test": "cypress-10-executor-smoke-chrome"}]}, - {"execute": [{"test": "cypress-10-executor-smoke-firefox"}]}, - {"execute": [{"test": "cypress-9-executor-smoke-electron"}]}, - {"execute": [{"test": "cypress-9-executor-smoke-chrome"}]}, - {"execute": [{"test": "cypress-9-executor-smoke-firefox"}]}, - {"execute": [{"test": "cypress-8-executor-smoke-electron"}]}, - {"execute": [{"test": "cypress-8-executor-smoke-chrome"}]}, - {"execute": [{"test": "cypress-8-executor-smoke-firefox"}]}, - {"execute": [{"test": "cypress-default-executor-smoke-electron"}]}, - {"execute": [{"test": "cypress-default-executor-smoke-electron-git-dir"}]}, - {"execute": [{"test": "cypress-default-executor-smoke-electron-testsource"}]}, - {"execute": [{"test": "cypress-default-executor-smoke-electron-testsource-git-dir"}]}, - {"execute": [{"test": "cypress-default-executor-smoke-yarn"}]}, - {"execute": [{"test": "cypress-default-executor-smoke-video-recording-enabled"}]}, - {"execute": [{"test": "cypress-default-executor-smoke-electron-negative"}]} - ] -} diff --git a/test/suites/executor-cypress-smoke-tests.yaml b/test/suites/executor-cypress-smoke-tests.yaml new file mode 100644 index 00000000000..26953168fd1 --- /dev/null +++ b/test/suites/executor-cypress-smoke-tests.yaml @@ -0,0 +1,76 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-cypress-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "Cypress executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: cypress-12-executor-smoke-electron + - stopOnFailure: false + execute: + - test: cypress-12-executor-smoke-chrome + - stopOnFailure: false + execute: + - test: cypress-12-executor-smoke-firefox + - stopOnFailure: false + execute: + - test: cypress-11-executor-smoke-electron + - stopOnFailure: false + execute: + - test: cypress-11-executor-smoke-chrome + - stopOnFailure: false + execute: + - test: cypress-11-executor-smoke-firefox + - stopOnFailure: false + execute: + - test: cypress-10-executor-smoke-electron + - stopOnFailure: false + execute: + - test: cypress-10-executor-smoke-chrome + - stopOnFailure: false + execute: + - test: cypress-10-executor-smoke-firefox + - stopOnFailure: false + execute: + - test: cypress-9-executor-smoke-electron + - stopOnFailure: false + execute: + - test: cypress-9-executor-smoke-chrome + - stopOnFailure: false + execute: + - test: cypress-9-executor-smoke-firefox + - stopOnFailure: false + execute: + - test: cypress-8-executor-smoke-electron + - stopOnFailure: false + execute: + - test: cypress-8-executor-smoke-chrome + - stopOnFailure: false + execute: + - test: cypress-8-executor-smoke-firefox + - stopOnFailure: false + execute: + - test: cypress-default-executor-smoke-electron + - stopOnFailure: false + execute: + - test: cypress-default-executor-smoke-electron-git-dir + - stopOnFailure: false + execute: + - test: cypress-default-executor-smoke-electron-testsource + - stopOnFailure: false + execute: + - test: cypress-default-executor-smoke-electron-testsource-git-dir + - stopOnFailure: false + execute: + - test: cypress-default-executor-smoke-yarn + - stopOnFailure: false + execute: + - test: cypress-default-executor-smoke-video-recording-enabled + - stopOnFailure: false + execute: + - test: cypress-default-executor-smoke-electron-negative diff --git a/test/suites/executor-ginkgo-smoke-tests.json b/test/suites/executor-ginkgo-smoke-tests.json deleted file mode 100644 index 8bf087f5eca..00000000000 --- a/test/suites/executor-ginkgo-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-ginkgo-smoke-tests", - "description": "ginkgo executor smoke tests", - "steps": [ - {"execute": {"name": "ginkgo-executor-smoke"}}, - {"execute": {"name": "ginkgo-executor-smoke-negative"}} - ] -} diff --git a/test/suites/executor-ginkgo-smoke-tests.yaml b/test/suites/executor-ginkgo-smoke-tests.yaml new file mode 100644 index 00000000000..9e4e5a9cc7d --- /dev/null +++ b/test/suites/executor-ginkgo-smoke-tests.yaml @@ -0,0 +1,16 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-ginkgo-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "ginkgo executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: ginkgo-executor-smoke + - stopOnFailure: false + execute: + - test: ginkgo-executor-smoke-negative diff --git a/test/suites/executor-gradle-smoke-tests.json b/test/suites/executor-gradle-smoke-tests.json deleted file mode 100644 index 1461b93c4d9..00000000000 --- a/test/suites/executor-gradle-smoke-tests.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "executor-gradle-smoke-tests", - "description": "gradle executor smoke tests", - "steps": [ - {"execute": [{"test": "gradle-executor-smoke-jdk18"}]}, - {"execute": [{"test": "gradle-executor-smoke-jdk17"}]}, - {"execute": [{"test": "gradle-executor-smoke-jdk11"}]}, - {"execute": [{"test": "gradle-executor-smoke-jdk8"}]}, - {"execute": [{"test": "gradle-executor-smoke-jdk18-negative"}]} - ] -} diff --git a/test/suites/executor-gradle-smoke-tests.yaml b/test/suites/executor-gradle-smoke-tests.yaml new file mode 100644 index 00000000000..b759ce60f1d --- /dev/null +++ b/test/suites/executor-gradle-smoke-tests.yaml @@ -0,0 +1,25 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-gradle-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "gradle executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: gradle-executor-smoke-jdk18 + - stopOnFailure: false + execute: + - test: gradle-executor-smoke-jdk17 + - stopOnFailure: false + execute: + - test: gradle-executor-smoke-jdk11 + - stopOnFailure: false + execute: + - test: gradle-executor-smoke-jdk8 + - stopOnFailure: false + execute: + - test: gradle-executor-smoke-jdk18-negative diff --git a/test/suites/executor-jmeter-smoke-tests.json b/test/suites/executor-jmeter-smoke-tests.json deleted file mode 100644 index cd6c102c1b2..00000000000 --- a/test/suites/executor-jmeter-smoke-tests.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "executor-jmeter-smoke-tests", - "description": "jmeter executor smoke tests", - "steps": [ - {"execute": [{"test": "jmeter-executor-smoke"}]}, - {"execute": [{"test": "jmeter-executor-smoke-directory"}]}, - {"execute": [{"test": "jmeter-executor-smoke-negative"}]}, - {"execute": [{"test": "jmeter-executor-smoke-env-and-property-values"}]} - ] -} diff --git a/test/suites/executor-jmeter-smoke-tests.yaml b/test/suites/executor-jmeter-smoke-tests.yaml new file mode 100644 index 00000000000..573b079125f --- /dev/null +++ b/test/suites/executor-jmeter-smoke-tests.yaml @@ -0,0 +1,22 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-jmeter-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "jmeter executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: jmeter-executor-smoke + - stopOnFailure: false + execute: + - test: jmeter-executor-smoke-directory + - stopOnFailure: false + execute: + - test: jmeter-executor-smoke-negative + - stopOnFailure: false + execute: + - test: jmeter-executor-smoke-env-and-property-values diff --git a/test/suites/executor-k6-other-tests.json b/test/suites/executor-k6-other-tests.json deleted file mode 100644 index 80aced98c62..00000000000 --- a/test/suites/executor-k6-other-tests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "executor-k6-other-tests", - "description": "k6 executor - other tests and edge-cases", - "steps": [ - {"execute": [{"test": "k6-executor-smoke-directory"}]} - ] -} diff --git a/test/suites/executor-k6-other-tests.yaml b/test/suites/executor-k6-other-tests.yaml new file mode 100644 index 00000000000..8a4c540d97a --- /dev/null +++ b/test/suites/executor-k6-other-tests.yaml @@ -0,0 +1,13 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-k6-other-tests + namespace: testkube + labels: + app: testkube +spec: + description: "k6 executor - other tests and edge-cases" + steps: + - stopOnFailure: false + execute: + - test: k6-executor-smoke-directory diff --git a/test/suites/executor-k6-smoke-tests.json b/test/suites/executor-k6-smoke-tests.json deleted file mode 100644 index c168799cdba..00000000000 --- a/test/suites/executor-k6-smoke-tests.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "executor-k6-smoke-tests", - "description": "k6 executor smoke tests", - "steps": [ - {"execute": [{"test": "k6-executor-smoke"}]}, - {"execute": [{"test": "k6-executor-smoke-git-file"}]}, - {"execute": [{"test": "k6-executor-smoke-negative"}]} - ] -} diff --git a/test/suites/executor-k6-smoke-tests.yaml b/test/suites/executor-k6-smoke-tests.yaml new file mode 100644 index 00000000000..f06278a8dea --- /dev/null +++ b/test/suites/executor-k6-smoke-tests.yaml @@ -0,0 +1,19 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-k6-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "k6 executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: k6-executor-smoke + - stopOnFailure: false + execute: + - test: k6-executor-smoke-git-file + - stopOnFailure: false + execute: + - test: k6-executor-smoke-negative diff --git a/test/suites/executor-kubepug-smoke-tests.json b/test/suites/executor-kubepug-smoke-tests.json deleted file mode 100644 index 45b45250e04..00000000000 --- a/test/suites/executor-kubepug-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-kubepug-smoke-tests", - "description": "kubepug executor smoke tests", - "steps": [ - {"execute": [{"test": "kubepug-executor-smoke"}]}, - {"execute": [{"test": "kubepug-executor-smoke-negative"}]} - ] -} diff --git a/test/suites/executor-kubepug-smoke-tests.yaml b/test/suites/executor-kubepug-smoke-tests.yaml new file mode 100644 index 00000000000..697b462ea84 --- /dev/null +++ b/test/suites/executor-kubepug-smoke-tests.yaml @@ -0,0 +1,16 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-kubepug-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "kubepug executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: kubepug-executor-smoke + - stopOnFailure: false + execute: + - test: kubepug-executor-smoke-negative diff --git a/test/suites/executor-maven-smoke-tests.json b/test/suites/executor-maven-smoke-tests.json deleted file mode 100644 index 708196575b3..00000000000 --- a/test/suites/executor-maven-smoke-tests.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "executor-maven-smoke-tests", - "description": "maven executor smoke tests", - "steps": [ - {"execute": [{"test": "maven-executor-smoke-jdk18"}]}, - {"execute": [{"test": "maven-executor-smoke-jdk11"}]}, - {"execute": [{"test": "maven-executor-smoke-jdk18-negative"}]} - ] -} diff --git a/test/suites/executor-maven-smoke-tests.yaml b/test/suites/executor-maven-smoke-tests.yaml new file mode 100644 index 00000000000..338ef4a31ae --- /dev/null +++ b/test/suites/executor-maven-smoke-tests.yaml @@ -0,0 +1,19 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-maven-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "maven executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: maven-executor-smoke-jdk18 + - stopOnFailure: false + execute: + - test: maven-executor-smoke-jdk11 + - stopOnFailure: false + execute: + - test: maven-executor-smoke-jdk18-negative diff --git a/test/suites/executor-playwright-smoke-tests.json b/test/suites/executor-playwright-smoke-tests.json deleted file mode 100644 index 5f935df5b37..00000000000 --- a/test/suites/executor-playwright-smoke-tests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "executor-playwright-smoke-tests", - "description": "playwright executor smoke tests", - "steps": [ - {"execute": {"name": "playwright-executor-smoke"}} - ] -} diff --git a/test/suites/executor-playwright-smoke-tests.yaml b/test/suites/executor-playwright-smoke-tests.yaml new file mode 100644 index 00000000000..b683e644958 --- /dev/null +++ b/test/suites/executor-playwright-smoke-tests.yaml @@ -0,0 +1,13 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-playwright-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "playwright executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: playwright-executor-smoke diff --git a/test/suites/executor-postman-smoke-tests.json b/test/suites/executor-postman-smoke-tests.json deleted file mode 100644 index aa12e5ba27a..00000000000 --- a/test/suites/executor-postman-smoke-tests.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "executor-postman-smoke-tests", - "description": "postman executor smoke tests", - "steps": [ - {"execute": [{"test": "postman-executor-smoke"}]}, - {"execute": [{"test": "postman-executor-smoke-git-file"}]}, - {"execute": [{"test": "postman-executor-smoke-testsource"}]}, - {"execute": [{"test": "postman-executor-smoke-testsource-git-file"}]}, - {"execute": [{"test": "postman-executor-smoke-testsource-overwrite"}]}, - {"execute": [{"test": "postman-executor-smoke-negative"}]} - ] -} diff --git a/test/suites/executor-postman-smoke-tests.yaml b/test/suites/executor-postman-smoke-tests.yaml new file mode 100644 index 00000000000..e9de9e879b8 --- /dev/null +++ b/test/suites/executor-postman-smoke-tests.yaml @@ -0,0 +1,28 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-postman-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "postman executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: postman-executor-smoke + - stopOnFailure: false + execute: + - test: postman-executor-smoke-git-file + - stopOnFailure: false + execute: + - test: postman-executor-smoke-testsource + - stopOnFailure: false + execute: + - test: postman-executor-smoke-testsource-git-file + - stopOnFailure: false + execute: + - test: postman-executor-smoke-testsource-overwrite + - stopOnFailure: false + execute: + - test: postman-executor-smoke-negative diff --git a/test/suites/executor-soapui-smoke-tests.json b/test/suites/executor-soapui-smoke-tests.json deleted file mode 100644 index 6b36e7c6c92..00000000000 --- a/test/suites/executor-soapui-smoke-tests.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "executor-soapui-smoke-tests", - "description": "soapui executor smoke tests", - "steps": [ - {"execute": [{"test": "soapui-executor-smoke"}]}, - {"execute": [{"test": "soapui-executor-smoke-negative"}]} - ] -} diff --git a/test/suites/executor-soapui-smoke-tests.yaml b/test/suites/executor-soapui-smoke-tests.yaml new file mode 100644 index 00000000000..8cde0b00d92 --- /dev/null +++ b/test/suites/executor-soapui-smoke-tests.yaml @@ -0,0 +1,16 @@ +apiVersion: tests.testkube.io/v3 +kind: TestSuite +metadata: + name: executor-soapui-smoke-tests + namespace: testkube + labels: + app: testkube +spec: + description: "soapui executor smoke tests" + steps: + - stopOnFailure: false + execute: + - test: soapui-executor-smoke + - stopOnFailure: false + execute: + - test: soapui-executor-smoke-negative