From 01fbdca76ec23316dd536845acf06a5c6ca0dba4 Mon Sep 17 00:00:00 2001 From: Tomasz Konieczny Date: Wed, 4 Sep 2024 12:32:59 +0200 Subject: [PATCH] feat: Workflows - suites and cron triggers for dev and sandbox (#5810) * run script fixed - missing artillery workflow added * test workflow suites - parallelism options added * test workflow suites - full smoke and small smoke, cron triggers - dev full/small and sandbox small * run script fixed - missing artillery workflow added - all * artillery .yaml renamed * workflow suites - labels added * workflow suites - labels added --- .../smoke.yaml} | 0 test/scripts/executor-tests/run.sh | 2 ++ .../test-workflows/artillery-workflow.yaml | 1 + .../cron/dev/full-smoke-cron.yaml | 14 +++++++++++++ .../cron/dev/small-smoke-cron.yaml | 14 +++++++++++++ .../cron/sandbox/small-smoke-cron.yaml | 14 +++++++++++++ .../test-workflows/cypress-workflow.yaml | 1 + test/suites/test-workflows/full-smoke.yaml | 20 +++++++++++++++++++ .../test-workflows/gradle-workflow.yaml | 1 + .../test-workflows/jmeter-workflow.yaml | 1 + test/suites/test-workflows/k6-workflow.yaml | 1 + .../suites/test-workflows/maven-workflow.yaml | 1 + .../test-workflows/playwright-workflow.yaml | 1 + test/suites/test-workflows/small-smoke.yaml | 17 ++++++++++++++++ .../test-workflows/soapui-workflow.yaml | 1 + 15 files changed, 89 insertions(+) rename test/artillery/executor-smoke/{crd/crd-workflow.yaml => crd-workflow/smoke.yaml} (100%) create mode 100644 test/suites/test-workflows/cron/dev/full-smoke-cron.yaml create mode 100644 test/suites/test-workflows/cron/dev/small-smoke-cron.yaml create mode 100644 test/suites/test-workflows/cron/sandbox/small-smoke-cron.yaml create mode 100644 test/suites/test-workflows/full-smoke.yaml create mode 100644 test/suites/test-workflows/small-smoke.yaml diff --git a/test/artillery/executor-smoke/crd/crd-workflow.yaml b/test/artillery/executor-smoke/crd-workflow/smoke.yaml similarity index 100% rename from test/artillery/executor-smoke/crd/crd-workflow.yaml rename to test/artillery/executor-smoke/crd-workflow/smoke.yaml diff --git a/test/scripts/executor-tests/run.sh b/test/scripts/executor-tests/run.sh index 906240d20a4..7fa1eb956d7 100755 --- a/test/scripts/executor-tests/run.sh +++ b/test/scripts/executor-tests/run.sh @@ -570,6 +570,7 @@ main() { playwright-smoke postman-smoke soapui-smoke + workflow-artillery-smoke workflow-cypress-smoke workflow-gradle-smoke workflow-jmeter-smoke @@ -586,6 +587,7 @@ main() { special-cases-jmeter ;; workflow) + workflow-artillery-smoke workflow-cypress-smoke workflow-gradle-smoke workflow-jmeter-smoke diff --git a/test/suites/test-workflows/artillery-workflow.yaml b/test/suites/test-workflows/artillery-workflow.yaml index ce0a7493cb3..b9790dd5881 100644 --- a/test/suites/test-workflows/artillery-workflow.yaml +++ b/test/suites/test-workflows/artillery-workflow.yaml @@ -7,6 +7,7 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: artillery-workflow-smoke - name: artillery-workflow-smoke-template diff --git a/test/suites/test-workflows/cron/dev/full-smoke-cron.yaml b/test/suites/test-workflows/cron/dev/full-smoke-cron.yaml new file mode 100644 index 00000000000..06fd16e9a89 --- /dev/null +++ b/test/suites/test-workflows/cron/dev/full-smoke-cron.yaml @@ -0,0 +1,14 @@ +kind: TestWorkflow +apiVersion: testworkflows.testkube.io/v1 +metadata: + name: tw-suite-full-smoke-cron-trigger + labels: + core-tests: workflows +spec: + steps: + - execute: + workflows: + - name: tw-suite-full-smoke + events: + - cronjob: + cron: "30 */4 * * *" # every 4 hours diff --git a/test/suites/test-workflows/cron/dev/small-smoke-cron.yaml b/test/suites/test-workflows/cron/dev/small-smoke-cron.yaml new file mode 100644 index 00000000000..cba252b7edd --- /dev/null +++ b/test/suites/test-workflows/cron/dev/small-smoke-cron.yaml @@ -0,0 +1,14 @@ +kind: TestWorkflow +apiVersion: testworkflows.testkube.io/v1 +metadata: + name: tw-suite-small-smoke-cron-trigger + labels: + core-tests: workflows +spec: + steps: + - execute: + workflows: + - name: tw-suite-small-smoke + events: + - cronjob: + cron: "0,20,40 * * * *" # every 20 minutes diff --git a/test/suites/test-workflows/cron/sandbox/small-smoke-cron.yaml b/test/suites/test-workflows/cron/sandbox/small-smoke-cron.yaml new file mode 100644 index 00000000000..475a567471d --- /dev/null +++ b/test/suites/test-workflows/cron/sandbox/small-smoke-cron.yaml @@ -0,0 +1,14 @@ +kind: TestWorkflow +apiVersion: testworkflows.testkube.io/v1 +metadata: + name: tw-suite-small-sandbox-smoke-cron-trigger + labels: + core-tests: workflows +spec: + steps: + - execute: + workflows: + - name: tw-suite-small-smoke + events: + - cronjob: + cron: "15 */2 * * *" # every 2 hours diff --git a/test/suites/test-workflows/cypress-workflow.yaml b/test/suites/test-workflows/cypress-workflow.yaml index b1c74bace25..33be918e1ac 100644 --- a/test/suites/test-workflows/cypress-workflow.yaml +++ b/test/suites/test-workflows/cypress-workflow.yaml @@ -7,6 +7,7 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: cypress-workflow-smoke-13 - name: cypress-workflow-smoke-13-video-recording-enabled diff --git a/test/suites/test-workflows/full-smoke.yaml b/test/suites/test-workflows/full-smoke.yaml new file mode 100644 index 00000000000..ff4e1f6867d --- /dev/null +++ b/test/suites/test-workflows/full-smoke.yaml @@ -0,0 +1,20 @@ +kind: TestWorkflow +apiVersion: testworkflows.testkube.io/v1 +metadata: + name: tw-suite-full-smoke + labels: + core-tests: workflows-suite +spec: + steps: + - execute: + parallelism: 2 + workflows: + - name: artillery-workflow-suite + - name: cypress-workflow-suite + - name: gradle-workflow-suite + - name: jmeter-workflow-suite + - name: k6-workflow-suite + - name: maven-workflow-suite + - name: playwright-workflow-suite + - name: postman-workflow-suite + - name: soapui-workflow-suite diff --git a/test/suites/test-workflows/gradle-workflow.yaml b/test/suites/test-workflows/gradle-workflow.yaml index 06f5601eed8..4113fb60ebf 100644 --- a/test/suites/test-workflows/gradle-workflow.yaml +++ b/test/suites/test-workflows/gradle-workflow.yaml @@ -7,6 +7,7 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: gradle-workflow-smoke-jdk11 - name: gradle-workflow-smoke-jdk11-default-command diff --git a/test/suites/test-workflows/jmeter-workflow.yaml b/test/suites/test-workflows/jmeter-workflow.yaml index b27a67e0efa..72b0651ac85 100644 --- a/test/suites/test-workflows/jmeter-workflow.yaml +++ b/test/suites/test-workflows/jmeter-workflow.yaml @@ -7,6 +7,7 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: jmeter-workflow-smoke - name: jmeter-workflow-smoke-shell-artifacts diff --git a/test/suites/test-workflows/k6-workflow.yaml b/test/suites/test-workflows/k6-workflow.yaml index 23cb76e25d9..8fba8eb27e1 100644 --- a/test/suites/test-workflows/k6-workflow.yaml +++ b/test/suites/test-workflows/k6-workflow.yaml @@ -7,6 +7,7 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: k6-workflow-smoke - name: k6-workflow-smoke-template diff --git a/test/suites/test-workflows/maven-workflow.yaml b/test/suites/test-workflows/maven-workflow.yaml index 19dd939b0fd..169113b3f6e 100644 --- a/test/suites/test-workflows/maven-workflow.yaml +++ b/test/suites/test-workflows/maven-workflow.yaml @@ -7,6 +7,7 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: maven-workflow-smoke-jdk11 - name: maven-workflow-smoke-jdk11-from-template diff --git a/test/suites/test-workflows/playwright-workflow.yaml b/test/suites/test-workflows/playwright-workflow.yaml index 8b0c74597c4..f1ba8de27df 100644 --- a/test/suites/test-workflows/playwright-workflow.yaml +++ b/test/suites/test-workflows/playwright-workflow.yaml @@ -7,6 +7,7 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: playwright-workflow-smoke-v1.32.3 - name: playwright-workflow-smoke-v1.32.3-custom-report-dir diff --git a/test/suites/test-workflows/small-smoke.yaml b/test/suites/test-workflows/small-smoke.yaml new file mode 100644 index 00000000000..93307ec51e9 --- /dev/null +++ b/test/suites/test-workflows/small-smoke.yaml @@ -0,0 +1,17 @@ +kind: TestWorkflow +apiVersion: testworkflows.testkube.io/v1 +metadata: + name: tw-suite-small-smoke + labels: + core-tests: workflows-suite +spec: + steps: + - execute: + parallelism: 2 + workflows: + - name: artillery-workflow-smoke + - name: gradle-workflow-smoke-jdk11-from-template + - name: jmeter-workflow-smoke-shell-artifacts + - name: k6-workflow-smoke-artifacts + - name: postman-workflow-smoke-template + - name: soapui-workflow-smoke diff --git a/test/suites/test-workflows/soapui-workflow.yaml b/test/suites/test-workflows/soapui-workflow.yaml index f5e95fdb9bf..44b700e5662 100644 --- a/test/suites/test-workflows/soapui-workflow.yaml +++ b/test/suites/test-workflows/soapui-workflow.yaml @@ -7,5 +7,6 @@ metadata: spec: steps: - execute: + parallelism: 2 workflows: - name: soapui-workflow-smoke