diff --git a/.sonarcloud.properties b/.sonarcloud.properties index 1c40752f6a..0a9444a9a5 100644 --- a/.sonarcloud.properties +++ b/.sonarcloud.properties @@ -1,5 +1,6 @@ sonar.projectKey=keptn_lifecycle-toolkit sonar.projectName=lifecycle-toolkit +sonar.exclusions=test/kuttl/**/*.yaml sonar.cpd.exclusions= **/*_test.go,\ scheduler/test/e2e/fake/**/*.go,\ lifecycle-operator/apis/lifecycle/v1alpha1/**/*.go,\ diff --git a/Makefile b/Makefile index 85c665b317..5018c88e10 100644 --- a/Makefile +++ b/Makefile @@ -24,33 +24,33 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize .PHONY: integration-test #these tests should run on a real cluster! integration-test: # to run a single test by name use --test eg. --test=expose-keptn-metric - kubectl kuttl test --start-kind=false ./test/integration/ --config=kuttl-test.yaml - kubectl kuttl test --start-kind=false ./test/testmetrics/ --config=kuttl-test.yaml - kubectl kuttl test --start-kind=false ./test/testanalysis/ --config=kuttl-test.yaml - kubectl kuttl test --start-kind=false ./test/testcertificate/ --config=kuttl-test.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/integration/ --config=kuttl-test.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/testmetrics/ --config=kuttl-test.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/testanalysis/ --config=kuttl-test.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/testcertificate/ --config=kuttl-test.yaml .PHONY: integration-test-local #these tests should run on a real cluster! integration-test-local: install-prometheus - kubectl kuttl test --start-kind=false ./test/integration/ --config=kuttl-test-local.yaml - kubectl kuttl test --start-kind=false ./test/testmetrics/ --config=kuttl-test-local.yaml - kubectl kuttl test --start-kind=false ./test/testanalysis/ --config=kuttl-test-local.yaml - kubectl kuttl test --start-kind=false ./test/testcertificate/ --config=kuttl-test-local.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/integration/ --config=kuttl-test-local.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/testmetrics/ --config=kuttl-test-local.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/testanalysis/ --config=kuttl-test-local.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/testcertificate/ --config=kuttl-test-local.yaml .PHONY: integration-test-scheduling-gates #these tests should run on a real cluster! integration-test-scheduling-gates: # to run a single test by name use --test eg. --test=expose-keptn-metric - kubectl kuttl test --start-kind=false ./test/scheduling-gates/ --config=kuttl-test.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/scheduling-gates/ --config=kuttl-test.yaml .PHONY: integration-test-scheduling-gates-local #these tests should run on a real cluster! integration-test-scheduling-gates-local: install-prometheus - kubectl kuttl test --start-kind=false ./test/scheduling-gates/ --config=kuttl-test-local.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/scheduling-gates/ --config=kuttl-test-local.yaml .PHONY: integration-test-allowed-namespaces #these tests should run on a real cluster! integration-test-allowed-namespaces: # to run a single test by name use --test eg. --test=expose-keptn-metric - kubectl kuttl test --start-kind=false ./test/allowed-namespaces/ --config=kuttl-test.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/allowed-namespaces/ --config=kuttl-test.yaml .PHONY: integration-test-allowed-namespaces-local #these tests should run on a real cluster! integration-test-allowed-namespaces-local: install-prometheus - kubectl kuttl test --start-kind=false ./test/allowed-namespaces/ --config=kuttl-test-local.yaml + kubectl kuttl test --start-kind=false ./test/kuttl/allowed-namespaces/ --config=kuttl-test-local.yaml .PHONY: load-test load-test: diff --git a/docs/docs/guides/slo.md b/docs/docs/guides/slo.md index 1b45ed1ced..1eaff14125 100644 --- a/docs/docs/guides/slo.md +++ b/docs/docs/guides/slo.md @@ -149,7 +149,7 @@ so, in this case, the query becomes: The other key-value pairs such as 'project' and 'stage' are just examples of how one could pass to the provider information similar to Keptn v1 objectives. -For a working example you can +For a working example, you can check [here](https://github.com/keptn/lifecycle-toolkit/tree/main/test/testanalysis/analysis-controller-multiple-providers). ## Accessing Analysis diff --git a/test/allowed-namespaces/simple-deployment-allowed/00-assert.yaml b/test/kuttl/allowed-namespaces/simple-deployment-allowed/00-assert.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-allowed/00-assert.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-allowed/00-assert.yaml diff --git a/test/allowed-namespaces/simple-deployment-allowed/00-install.yaml b/test/kuttl/allowed-namespaces/simple-deployment-allowed/00-install.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-allowed/00-install.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-allowed/00-install.yaml diff --git a/test/allowed-namespaces/simple-deployment-allowed/00-teststep.yaml b/test/kuttl/allowed-namespaces/simple-deployment-allowed/00-teststep.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-allowed/00-teststep.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-allowed/00-teststep.yaml diff --git a/test/allowed-namespaces/simple-deployment-allowed/01-assert.yaml b/test/kuttl/allowed-namespaces/simple-deployment-allowed/01-assert.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-allowed/01-assert.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-allowed/01-assert.yaml diff --git a/test/allowed-namespaces/simple-deployment-not-allowed/00-assert.yaml b/test/kuttl/allowed-namespaces/simple-deployment-not-allowed/00-assert.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-not-allowed/00-assert.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-not-allowed/00-assert.yaml diff --git a/test/allowed-namespaces/simple-deployment-not-allowed/00-install.yaml b/test/kuttl/allowed-namespaces/simple-deployment-not-allowed/00-install.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-not-allowed/00-install.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-not-allowed/00-install.yaml diff --git a/test/allowed-namespaces/simple-deployment-not-allowed/00-teststep.yaml b/test/kuttl/allowed-namespaces/simple-deployment-not-allowed/00-teststep.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-not-allowed/00-teststep.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-not-allowed/00-teststep.yaml diff --git a/test/allowed-namespaces/simple-deployment-not-allowed/01-verify.yaml b/test/kuttl/allowed-namespaces/simple-deployment-not-allowed/01-verify.yaml similarity index 100% rename from test/allowed-namespaces/simple-deployment-not-allowed/01-verify.yaml rename to test/kuttl/allowed-namespaces/simple-deployment-not-allowed/01-verify.yaml diff --git a/test/common-scripts/verify-number-of-resources.sh b/test/kuttl/common-scripts/verify-number-of-resources.sh similarity index 100% rename from test/common-scripts/verify-number-of-resources.sh rename to test/kuttl/common-scripts/verify-number-of-resources.sh diff --git a/test/integration/TTLSecondsAfterFinished-in-jobs/00-assert.yaml b/test/kuttl/integration/TTLSecondsAfterFinished-in-jobs/00-assert.yaml similarity index 100% rename from test/integration/TTLSecondsAfterFinished-in-jobs/00-assert.yaml rename to test/kuttl/integration/TTLSecondsAfterFinished-in-jobs/00-assert.yaml diff --git a/test/integration/TTLSecondsAfterFinished-in-jobs/00-install.yaml b/test/kuttl/integration/TTLSecondsAfterFinished-in-jobs/00-install.yaml similarity index 100% rename from test/integration/TTLSecondsAfterFinished-in-jobs/00-install.yaml rename to test/kuttl/integration/TTLSecondsAfterFinished-in-jobs/00-install.yaml diff --git a/test/integration/annotated-namespace-not-enabled/00-assert.yaml b/test/kuttl/integration/annotated-namespace-not-enabled/00-assert.yaml similarity index 100% rename from test/integration/annotated-namespace-not-enabled/00-assert.yaml rename to test/kuttl/integration/annotated-namespace-not-enabled/00-assert.yaml diff --git a/test/integration/annotated-namespace-not-enabled/00-install.yaml b/test/kuttl/integration/annotated-namespace-not-enabled/00-install.yaml similarity index 100% rename from test/integration/annotated-namespace-not-enabled/00-install.yaml rename to test/kuttl/integration/annotated-namespace-not-enabled/00-install.yaml diff --git a/test/integration/api-conversion-v1alpha-to-v1beta1/00-assert.yaml b/test/kuttl/integration/api-conversion-v1alpha-to-v1beta1/00-assert.yaml similarity index 100% rename from test/integration/api-conversion-v1alpha-to-v1beta1/00-assert.yaml rename to test/kuttl/integration/api-conversion-v1alpha-to-v1beta1/00-assert.yaml diff --git a/test/integration/api-conversion-v1alpha-to-v1beta1/00-install.yaml b/test/kuttl/integration/api-conversion-v1alpha-to-v1beta1/00-install.yaml similarity index 100% rename from test/integration/api-conversion-v1alpha-to-v1beta1/00-install.yaml rename to test/kuttl/integration/api-conversion-v1alpha-to-v1beta1/00-install.yaml diff --git a/test/integration/api-conversion-v1beta1-to-v1alpha/00-assert.yaml b/test/kuttl/integration/api-conversion-v1beta1-to-v1alpha/00-assert.yaml similarity index 100% rename from test/integration/api-conversion-v1beta1-to-v1alpha/00-assert.yaml rename to test/kuttl/integration/api-conversion-v1beta1-to-v1alpha/00-assert.yaml diff --git a/test/integration/api-conversion-v1beta1-to-v1alpha/00-install.yaml b/test/kuttl/integration/api-conversion-v1beta1-to-v1alpha/00-install.yaml similarity index 100% rename from test/integration/api-conversion-v1beta1-to-v1alpha/00-install.yaml rename to test/kuttl/integration/api-conversion-v1beta1-to-v1alpha/00-install.yaml diff --git a/test/integration/api-conversion/00-assert.yaml b/test/kuttl/integration/api-conversion/00-assert.yaml similarity index 100% rename from test/integration/api-conversion/00-assert.yaml rename to test/kuttl/integration/api-conversion/00-assert.yaml diff --git a/test/integration/api-conversion/00-install.yaml b/test/kuttl/integration/api-conversion/00-install.yaml similarity index 100% rename from test/integration/api-conversion/00-install.yaml rename to test/kuttl/integration/api-conversion/00-install.yaml diff --git a/test/integration/api-conversion/01-assert.yaml b/test/kuttl/integration/api-conversion/01-assert.yaml similarity index 100% rename from test/integration/api-conversion/01-assert.yaml rename to test/kuttl/integration/api-conversion/01-assert.yaml diff --git a/test/integration/api-conversion/01-install.yaml b/test/kuttl/integration/api-conversion/01-install.yaml similarity index 100% rename from test/integration/api-conversion/01-install.yaml rename to test/kuttl/integration/api-conversion/01-install.yaml diff --git a/test/integration/app-creation-request/00-assert.yaml b/test/kuttl/integration/app-creation-request/00-assert.yaml similarity index 100% rename from test/integration/app-creation-request/00-assert.yaml rename to test/kuttl/integration/app-creation-request/00-assert.yaml diff --git a/test/integration/app-creation-request/00-install.yaml b/test/kuttl/integration/app-creation-request/00-install.yaml similarity index 100% rename from test/integration/app-creation-request/00-install.yaml rename to test/kuttl/integration/app-creation-request/00-install.yaml diff --git a/test/integration/app-creation-request/00-teststep.yaml b/test/kuttl/integration/app-creation-request/00-teststep.yaml similarity index 100% rename from test/integration/app-creation-request/00-teststep.yaml rename to test/kuttl/integration/app-creation-request/00-teststep.yaml diff --git a/test/integration/app-creation-request/01-assert.yaml b/test/kuttl/integration/app-creation-request/01-assert.yaml similarity index 100% rename from test/integration/app-creation-request/01-assert.yaml rename to test/kuttl/integration/app-creation-request/01-assert.yaml diff --git a/test/integration/app-creation-request/01-install.yaml b/test/kuttl/integration/app-creation-request/01-install.yaml similarity index 100% rename from test/integration/app-creation-request/01-install.yaml rename to test/kuttl/integration/app-creation-request/01-install.yaml diff --git a/test/integration/app-failing-post-evaluation/00-assert.yaml b/test/kuttl/integration/app-failing-post-evaluation/00-assert.yaml similarity index 100% rename from test/integration/app-failing-post-evaluation/00-assert.yaml rename to test/kuttl/integration/app-failing-post-evaluation/00-assert.yaml diff --git a/test/integration/app-failing-post-evaluation/00-install.yaml b/test/kuttl/integration/app-failing-post-evaluation/00-install.yaml similarity index 100% rename from test/integration/app-failing-post-evaluation/00-install.yaml rename to test/kuttl/integration/app-failing-post-evaluation/00-install.yaml diff --git a/test/integration/app-failing-post-evaluation/00-teststep.yaml b/test/kuttl/integration/app-failing-post-evaluation/00-teststep.yaml similarity index 100% rename from test/integration/app-failing-post-evaluation/00-teststep.yaml rename to test/kuttl/integration/app-failing-post-evaluation/00-teststep.yaml diff --git a/test/integration/app-failing-post-task/00-assert.yaml b/test/kuttl/integration/app-failing-post-task/00-assert.yaml similarity index 100% rename from test/integration/app-failing-post-task/00-assert.yaml rename to test/kuttl/integration/app-failing-post-task/00-assert.yaml diff --git a/test/integration/app-failing-post-task/00-install.yaml b/test/kuttl/integration/app-failing-post-task/00-install.yaml similarity index 100% rename from test/integration/app-failing-post-task/00-install.yaml rename to test/kuttl/integration/app-failing-post-task/00-install.yaml diff --git a/test/integration/app-failing-post-task/00-teststep.yaml b/test/kuttl/integration/app-failing-post-task/00-teststep.yaml similarity index 100% rename from test/integration/app-failing-post-task/00-teststep.yaml rename to test/kuttl/integration/app-failing-post-task/00-teststep.yaml diff --git a/test/integration/app-failing-pre-evaluation/00-assert.yaml b/test/kuttl/integration/app-failing-pre-evaluation/00-assert.yaml similarity index 100% rename from test/integration/app-failing-pre-evaluation/00-assert.yaml rename to test/kuttl/integration/app-failing-pre-evaluation/00-assert.yaml diff --git a/test/integration/app-failing-pre-evaluation/00-install.yaml b/test/kuttl/integration/app-failing-pre-evaluation/00-install.yaml similarity index 100% rename from test/integration/app-failing-pre-evaluation/00-install.yaml rename to test/kuttl/integration/app-failing-pre-evaluation/00-install.yaml diff --git a/test/integration/app-failing-pre-evaluation/00-teststep.yaml b/test/kuttl/integration/app-failing-pre-evaluation/00-teststep.yaml similarity index 100% rename from test/integration/app-failing-pre-evaluation/00-teststep.yaml rename to test/kuttl/integration/app-failing-pre-evaluation/00-teststep.yaml diff --git a/test/integration/app-failing-pre-task-retry/00-assert.yaml b/test/kuttl/integration/app-failing-pre-task-retry/00-assert.yaml similarity index 100% rename from test/integration/app-failing-pre-task-retry/00-assert.yaml rename to test/kuttl/integration/app-failing-pre-task-retry/00-assert.yaml diff --git a/test/integration/app-failing-pre-task-retry/00-install.yaml b/test/kuttl/integration/app-failing-pre-task-retry/00-install.yaml similarity index 100% rename from test/integration/app-failing-pre-task-retry/00-install.yaml rename to test/kuttl/integration/app-failing-pre-task-retry/00-install.yaml diff --git a/test/integration/app-failing-pre-task-retry/00-teststep.yaml b/test/kuttl/integration/app-failing-pre-task-retry/00-teststep.yaml similarity index 100% rename from test/integration/app-failing-pre-task-retry/00-teststep.yaml rename to test/kuttl/integration/app-failing-pre-task-retry/00-teststep.yaml diff --git a/test/integration/app-failing-pre-task-timeout/00-assert.yaml b/test/kuttl/integration/app-failing-pre-task-timeout/00-assert.yaml similarity index 100% rename from test/integration/app-failing-pre-task-timeout/00-assert.yaml rename to test/kuttl/integration/app-failing-pre-task-timeout/00-assert.yaml diff --git a/test/integration/app-failing-pre-task-timeout/00-install.yaml b/test/kuttl/integration/app-failing-pre-task-timeout/00-install.yaml similarity index 100% rename from test/integration/app-failing-pre-task-timeout/00-install.yaml rename to test/kuttl/integration/app-failing-pre-task-timeout/00-install.yaml diff --git a/test/integration/app-failing-pre-task-timeout/00-teststep.yaml b/test/kuttl/integration/app-failing-pre-task-timeout/00-teststep.yaml similarity index 100% rename from test/integration/app-failing-pre-task-timeout/00-teststep.yaml rename to test/kuttl/integration/app-failing-pre-task-timeout/00-teststep.yaml diff --git a/test/integration/app-failing-pre-task/00-assert.yaml b/test/kuttl/integration/app-failing-pre-task/00-assert.yaml similarity index 100% rename from test/integration/app-failing-pre-task/00-assert.yaml rename to test/kuttl/integration/app-failing-pre-task/00-assert.yaml diff --git a/test/integration/app-failing-pre-task/00-install.yaml b/test/kuttl/integration/app-failing-pre-task/00-install.yaml similarity index 100% rename from test/integration/app-failing-pre-task/00-install.yaml rename to test/kuttl/integration/app-failing-pre-task/00-install.yaml diff --git a/test/integration/app-failing-pre-task/00-teststep.yaml b/test/kuttl/integration/app-failing-pre-task/00-teststep.yaml similarity index 100% rename from test/integration/app-failing-pre-task/00-teststep.yaml rename to test/kuttl/integration/app-failing-pre-task/00-teststep.yaml diff --git a/test/integration/app-one-taskdefinition-not-found/00-assert.yaml b/test/kuttl/integration/app-one-taskdefinition-not-found/00-assert.yaml similarity index 100% rename from test/integration/app-one-taskdefinition-not-found/00-assert.yaml rename to test/kuttl/integration/app-one-taskdefinition-not-found/00-assert.yaml diff --git a/test/integration/app-one-taskdefinition-not-found/00-install.yaml b/test/kuttl/integration/app-one-taskdefinition-not-found/00-install.yaml similarity index 100% rename from test/integration/app-one-taskdefinition-not-found/00-install.yaml rename to test/kuttl/integration/app-one-taskdefinition-not-found/00-install.yaml diff --git a/test/integration/app-one-taskdefinition-not-found/00-teststep.yaml b/test/kuttl/integration/app-one-taskdefinition-not-found/00-teststep.yaml similarity index 100% rename from test/integration/app-one-taskdefinition-not-found/00-teststep.yaml rename to test/kuttl/integration/app-one-taskdefinition-not-found/00-teststep.yaml diff --git a/test/integration/app-one-taskdefinition-not-found/01-teststep-verify-number-of-tasks.yaml b/test/kuttl/integration/app-one-taskdefinition-not-found/01-teststep-verify-number-of-tasks.yaml similarity index 100% rename from test/integration/app-one-taskdefinition-not-found/01-teststep-verify-number-of-tasks.yaml rename to test/kuttl/integration/app-one-taskdefinition-not-found/01-teststep-verify-number-of-tasks.yaml diff --git a/test/integration/container-runtime/00-assert.yaml b/test/kuttl/integration/container-runtime/00-assert.yaml similarity index 100% rename from test/integration/container-runtime/00-assert.yaml rename to test/kuttl/integration/container-runtime/00-assert.yaml diff --git a/test/integration/container-runtime/00-install.yaml b/test/kuttl/integration/container-runtime/00-install.yaml similarity index 100% rename from test/integration/container-runtime/00-install.yaml rename to test/kuttl/integration/container-runtime/00-install.yaml diff --git a/test/integration/container-runtime/00-teststep.yaml b/test/kuttl/integration/container-runtime/00-teststep.yaml similarity index 100% rename from test/integration/container-runtime/00-teststep.yaml rename to test/kuttl/integration/container-runtime/00-teststep.yaml diff --git a/test/integration/expose-keptn-metric/00-teststep.yaml b/test/kuttl/integration/expose-keptn-metric/00-teststep.yaml similarity index 100% rename from test/integration/expose-keptn-metric/00-teststep.yaml rename to test/kuttl/integration/expose-keptn-metric/00-teststep.yaml diff --git a/test/integration/expose-keptn-metric/01-teststep.yaml b/test/kuttl/integration/expose-keptn-metric/01-teststep.yaml similarity index 100% rename from test/integration/expose-keptn-metric/01-teststep.yaml rename to test/kuttl/integration/expose-keptn-metric/01-teststep.yaml diff --git a/test/integration/expose-keptn-metric/job-existing-metric.yaml b/test/kuttl/integration/expose-keptn-metric/job-existing-metric.yaml similarity index 100% rename from test/integration/expose-keptn-metric/job-existing-metric.yaml rename to test/kuttl/integration/expose-keptn-metric/job-existing-metric.yaml diff --git a/test/integration/expose-keptn-metric/job-no-metric.yaml b/test/kuttl/integration/expose-keptn-metric/job-no-metric.yaml similarity index 100% rename from test/integration/expose-keptn-metric/job-no-metric.yaml rename to test/kuttl/integration/expose-keptn-metric/job-no-metric.yaml diff --git a/test/integration/imagepullsecret/00-assert.yaml b/test/kuttl/integration/imagepullsecret/00-assert.yaml similarity index 100% rename from test/integration/imagepullsecret/00-assert.yaml rename to test/kuttl/integration/imagepullsecret/00-assert.yaml diff --git a/test/integration/imagepullsecret/00-install.yaml b/test/kuttl/integration/imagepullsecret/00-install.yaml similarity index 100% rename from test/integration/imagepullsecret/00-install.yaml rename to test/kuttl/integration/imagepullsecret/00-install.yaml diff --git a/test/integration/imagepullsecret/00-teststep.yaml b/test/kuttl/integration/imagepullsecret/00-teststep.yaml similarity index 100% rename from test/integration/imagepullsecret/00-teststep.yaml rename to test/kuttl/integration/imagepullsecret/00-teststep.yaml diff --git a/test/integration/keptn-config/00-assert.yaml b/test/kuttl/integration/keptn-config/00-assert.yaml similarity index 100% rename from test/integration/keptn-config/00-assert.yaml rename to test/kuttl/integration/keptn-config/00-assert.yaml diff --git a/test/integration/keptn-config/00-install.yaml b/test/kuttl/integration/keptn-config/00-install.yaml similarity index 100% rename from test/integration/keptn-config/00-install.yaml rename to test/kuttl/integration/keptn-config/00-install.yaml diff --git a/test/integration/keptn-config/01-test-logs.yaml b/test/kuttl/integration/keptn-config/01-test-logs.yaml similarity index 100% rename from test/integration/keptn-config/01-test-logs.yaml rename to test/kuttl/integration/keptn-config/01-test-logs.yaml diff --git a/test/integration/keptn-config/get-logs.sh b/test/kuttl/integration/keptn-config/get-logs.sh similarity index 100% rename from test/integration/keptn-config/get-logs.sh rename to test/kuttl/integration/keptn-config/get-logs.sh diff --git a/test/integration/labelled-namespace-not-enabled/00-assert.yaml b/test/kuttl/integration/labelled-namespace-not-enabled/00-assert.yaml similarity index 100% rename from test/integration/labelled-namespace-not-enabled/00-assert.yaml rename to test/kuttl/integration/labelled-namespace-not-enabled/00-assert.yaml diff --git a/test/integration/labelled-namespace-not-enabled/00-install.yaml b/test/kuttl/integration/labelled-namespace-not-enabled/00-install.yaml similarity index 100% rename from test/integration/labelled-namespace-not-enabled/00-install.yaml rename to test/kuttl/integration/labelled-namespace-not-enabled/00-install.yaml diff --git a/test/integration/mixed-namespace-not-enabled/00-assert.yaml b/test/kuttl/integration/mixed-namespace-not-enabled/00-assert.yaml similarity index 100% rename from test/integration/mixed-namespace-not-enabled/00-assert.yaml rename to test/kuttl/integration/mixed-namespace-not-enabled/00-assert.yaml diff --git a/test/integration/mixed-namespace-not-enabled/00-install.yaml b/test/kuttl/integration/mixed-namespace-not-enabled/00-install.yaml similarity index 100% rename from test/integration/mixed-namespace-not-enabled/00-install.yaml rename to test/kuttl/integration/mixed-namespace-not-enabled/00-install.yaml diff --git a/test/integration/podtato-head-application-auto-app-discovery/00-assert.yaml b/test/kuttl/integration/podtato-head-application-auto-app-discovery/00-assert.yaml similarity index 100% rename from test/integration/podtato-head-application-auto-app-discovery/00-assert.yaml rename to test/kuttl/integration/podtato-head-application-auto-app-discovery/00-assert.yaml diff --git a/test/integration/podtato-head-application-auto-app-discovery/00-install.yaml b/test/kuttl/integration/podtato-head-application-auto-app-discovery/00-install.yaml similarity index 100% rename from test/integration/podtato-head-application-auto-app-discovery/00-install.yaml rename to test/kuttl/integration/podtato-head-application-auto-app-discovery/00-install.yaml diff --git a/test/integration/podtato-head-application-auto-app-discovery/00-teststep.yaml b/test/kuttl/integration/podtato-head-application-auto-app-discovery/00-teststep.yaml similarity index 100% rename from test/integration/podtato-head-application-auto-app-discovery/00-teststep.yaml rename to test/kuttl/integration/podtato-head-application-auto-app-discovery/00-teststep.yaml diff --git a/test/integration/podtato-head-application-keptnappcontext/00-assert.yaml b/test/kuttl/integration/podtato-head-application-keptnappcontext/00-assert.yaml similarity index 100% rename from test/integration/podtato-head-application-keptnappcontext/00-assert.yaml rename to test/kuttl/integration/podtato-head-application-keptnappcontext/00-assert.yaml diff --git a/test/integration/podtato-head-application-keptnappcontext/00-install.yaml b/test/kuttl/integration/podtato-head-application-keptnappcontext/00-install.yaml similarity index 100% rename from test/integration/podtato-head-application-keptnappcontext/00-install.yaml rename to test/kuttl/integration/podtato-head-application-keptnappcontext/00-install.yaml diff --git a/test/integration/podtato-head-application-keptnappcontext/00-teststep.yaml b/test/kuttl/integration/podtato-head-application-keptnappcontext/00-teststep.yaml similarity index 100% rename from test/integration/podtato-head-application-keptnappcontext/00-teststep.yaml rename to test/kuttl/integration/podtato-head-application-keptnappcontext/00-teststep.yaml diff --git a/test/integration/podtato-head-application/00-assert.yaml b/test/kuttl/integration/podtato-head-application/00-assert.yaml similarity index 100% rename from test/integration/podtato-head-application/00-assert.yaml rename to test/kuttl/integration/podtato-head-application/00-assert.yaml diff --git a/test/integration/podtato-head-application/00-install.yaml b/test/kuttl/integration/podtato-head-application/00-install.yaml similarity index 100% rename from test/integration/podtato-head-application/00-install.yaml rename to test/kuttl/integration/podtato-head-application/00-install.yaml diff --git a/test/integration/podtato-head-application/00-teststep.yaml b/test/kuttl/integration/podtato-head-application/00-teststep.yaml similarity index 100% rename from test/integration/podtato-head-application/00-teststep.yaml rename to test/kuttl/integration/podtato-head-application/00-teststep.yaml diff --git a/test/integration/restartable-app/00-assert.yaml b/test/kuttl/integration/restartable-app/00-assert.yaml similarity index 100% rename from test/integration/restartable-app/00-assert.yaml rename to test/kuttl/integration/restartable-app/00-assert.yaml diff --git a/test/integration/restartable-app/00-install.yaml b/test/kuttl/integration/restartable-app/00-install.yaml similarity index 100% rename from test/integration/restartable-app/00-install.yaml rename to test/kuttl/integration/restartable-app/00-install.yaml diff --git a/test/integration/restartable-app/00-teststep.yaml b/test/kuttl/integration/restartable-app/00-teststep.yaml similarity index 100% rename from test/integration/restartable-app/00-teststep.yaml rename to test/kuttl/integration/restartable-app/00-teststep.yaml diff --git a/test/integration/restartable-app/01-assert.yaml b/test/kuttl/integration/restartable-app/01-assert.yaml similarity index 100% rename from test/integration/restartable-app/01-assert.yaml rename to test/kuttl/integration/restartable-app/01-assert.yaml diff --git a/test/integration/restartable-app/01-install.yaml b/test/kuttl/integration/restartable-app/01-install.yaml similarity index 100% rename from test/integration/restartable-app/01-install.yaml rename to test/kuttl/integration/restartable-app/01-install.yaml diff --git a/test/integration/restartable-app/02-assert.yaml b/test/kuttl/integration/restartable-app/02-assert.yaml similarity index 100% rename from test/integration/restartable-app/02-assert.yaml rename to test/kuttl/integration/restartable-app/02-assert.yaml diff --git a/test/integration/restartable-app/02-install.yaml b/test/kuttl/integration/restartable-app/02-install.yaml similarity index 100% rename from test/integration/restartable-app/02-install.yaml rename to test/kuttl/integration/restartable-app/02-install.yaml diff --git a/test/integration/serviceaccount-in-jobs/00-assert.yaml b/test/kuttl/integration/serviceaccount-in-jobs/00-assert.yaml similarity index 100% rename from test/integration/serviceaccount-in-jobs/00-assert.yaml rename to test/kuttl/integration/serviceaccount-in-jobs/00-assert.yaml diff --git a/test/integration/serviceaccount-in-jobs/00-install.yaml b/test/kuttl/integration/serviceaccount-in-jobs/00-install.yaml similarity index 100% rename from test/integration/serviceaccount-in-jobs/00-install.yaml rename to test/kuttl/integration/serviceaccount-in-jobs/00-install.yaml diff --git a/test/integration/simple-daemonset-annotated/00-assert.yaml b/test/kuttl/integration/simple-daemonset-annotated/00-assert.yaml similarity index 100% rename from test/integration/simple-daemonset-annotated/00-assert.yaml rename to test/kuttl/integration/simple-daemonset-annotated/00-assert.yaml diff --git a/test/integration/simple-daemonset-annotated/00-install.yaml b/test/kuttl/integration/simple-daemonset-annotated/00-install.yaml similarity index 100% rename from test/integration/simple-daemonset-annotated/00-install.yaml rename to test/kuttl/integration/simple-daemonset-annotated/00-install.yaml diff --git a/test/integration/simple-daemonset-annotated/00-teststep.yaml b/test/kuttl/integration/simple-daemonset-annotated/00-teststep.yaml similarity index 100% rename from test/integration/simple-daemonset-annotated/00-teststep.yaml rename to test/kuttl/integration/simple-daemonset-annotated/00-teststep.yaml diff --git a/test/integration/simple-daemonset-annotated/01-assert.yaml b/test/kuttl/integration/simple-daemonset-annotated/01-assert.yaml similarity index 100% rename from test/integration/simple-daemonset-annotated/01-assert.yaml rename to test/kuttl/integration/simple-daemonset-annotated/01-assert.yaml diff --git a/test/integration/simple-daemonset-annotated/02-assert.yaml b/test/kuttl/integration/simple-daemonset-annotated/02-assert.yaml similarity index 100% rename from test/integration/simple-daemonset-annotated/02-assert.yaml rename to test/kuttl/integration/simple-daemonset-annotated/02-assert.yaml diff --git a/test/integration/simple-daemonset-annotated/02-install.yaml b/test/kuttl/integration/simple-daemonset-annotated/02-install.yaml similarity index 100% rename from test/integration/simple-daemonset-annotated/02-install.yaml rename to test/kuttl/integration/simple-daemonset-annotated/02-install.yaml diff --git a/test/integration/simple-deployment-annotated-with-app-context/00-assert.yaml b/test/kuttl/integration/simple-deployment-annotated-with-app-context/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-annotated-with-app-context/00-assert.yaml rename to test/kuttl/integration/simple-deployment-annotated-with-app-context/00-assert.yaml diff --git a/test/integration/simple-deployment-annotated-with-app-context/00-install.yaml b/test/kuttl/integration/simple-deployment-annotated-with-app-context/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-annotated-with-app-context/00-install.yaml rename to test/kuttl/integration/simple-deployment-annotated-with-app-context/00-install.yaml diff --git a/test/integration/simple-deployment-annotated-with-app-context/00-teststep.yaml b/test/kuttl/integration/simple-deployment-annotated-with-app-context/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-annotated-with-app-context/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-annotated-with-app-context/00-teststep.yaml diff --git a/test/integration/simple-deployment-annotated-with-app-context/01-assert.yaml b/test/kuttl/integration/simple-deployment-annotated-with-app-context/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment-annotated-with-app-context/01-assert.yaml rename to test/kuttl/integration/simple-deployment-annotated-with-app-context/01-assert.yaml diff --git a/test/integration/simple-deployment-annotated/00-assert.yaml b/test/kuttl/integration/simple-deployment-annotated/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-annotated/00-assert.yaml rename to test/kuttl/integration/simple-deployment-annotated/00-assert.yaml diff --git a/test/integration/simple-deployment-annotated/00-install.yaml b/test/kuttl/integration/simple-deployment-annotated/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-annotated/00-install.yaml rename to test/kuttl/integration/simple-deployment-annotated/00-install.yaml diff --git a/test/integration/simple-deployment-annotated/00-teststep.yaml b/test/kuttl/integration/simple-deployment-annotated/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-annotated/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-annotated/00-teststep.yaml diff --git a/test/integration/simple-deployment-annotated/01-assert.yaml b/test/kuttl/integration/simple-deployment-annotated/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment-annotated/01-assert.yaml rename to test/kuttl/integration/simple-deployment-annotated/01-assert.yaml diff --git a/test/integration/simple-deployment-container-annotation/00-assert.yaml b/test/kuttl/integration/simple-deployment-container-annotation/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-container-annotation/00-assert.yaml rename to test/kuttl/integration/simple-deployment-container-annotation/00-assert.yaml diff --git a/test/integration/simple-deployment-container-annotation/00-install.yaml b/test/kuttl/integration/simple-deployment-container-annotation/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-container-annotation/00-install.yaml rename to test/kuttl/integration/simple-deployment-container-annotation/00-install.yaml diff --git a/test/integration/simple-deployment-container-annotation/00-teststep.yaml b/test/kuttl/integration/simple-deployment-container-annotation/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-container-annotation/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-container-annotation/00-teststep.yaml diff --git a/test/integration/simple-deployment-container-annotation/01-assert.yaml b/test/kuttl/integration/simple-deployment-container-annotation/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment-container-annotation/01-assert.yaml rename to test/kuttl/integration/simple-deployment-container-annotation/01-assert.yaml diff --git a/test/integration/simple-deployment-container-annotation/01-install.yaml b/test/kuttl/integration/simple-deployment-container-annotation/01-install.yaml similarity index 100% rename from test/integration/simple-deployment-container-annotation/01-install.yaml rename to test/kuttl/integration/simple-deployment-container-annotation/01-install.yaml diff --git a/test/integration/simple-deployment-evaluation/00-assert.yaml b/test/kuttl/integration/simple-deployment-evaluation/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-evaluation/00-assert.yaml rename to test/kuttl/integration/simple-deployment-evaluation/00-assert.yaml diff --git a/test/integration/simple-deployment-evaluation/00-install.yaml b/test/kuttl/integration/simple-deployment-evaluation/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-evaluation/00-install.yaml rename to test/kuttl/integration/simple-deployment-evaluation/00-install.yaml diff --git a/test/integration/simple-deployment-evaluation/00-teststep.yaml b/test/kuttl/integration/simple-deployment-evaluation/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-evaluation/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-evaluation/00-teststep.yaml diff --git a/test/integration/simple-deployment-evaluation/01-assert.yaml b/test/kuttl/integration/simple-deployment-evaluation/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment-evaluation/01-assert.yaml rename to test/kuttl/integration/simple-deployment-evaluation/01-assert.yaml diff --git a/test/integration/simple-deployment-k8s-recommended-label/00-assert.yaml b/test/kuttl/integration/simple-deployment-k8s-recommended-label/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-k8s-recommended-label/00-assert.yaml rename to test/kuttl/integration/simple-deployment-k8s-recommended-label/00-assert.yaml diff --git a/test/integration/simple-deployment-k8s-recommended-label/00-install.yaml b/test/kuttl/integration/simple-deployment-k8s-recommended-label/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-k8s-recommended-label/00-install.yaml rename to test/kuttl/integration/simple-deployment-k8s-recommended-label/00-install.yaml diff --git a/test/integration/simple-deployment-k8s-recommended-label/00-teststep.yaml b/test/kuttl/integration/simple-deployment-k8s-recommended-label/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-k8s-recommended-label/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-k8s-recommended-label/00-teststep.yaml diff --git a/test/integration/simple-deployment-k8s-recommended-label/01-assert.yaml b/test/kuttl/integration/simple-deployment-k8s-recommended-label/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment-k8s-recommended-label/01-assert.yaml rename to test/kuttl/integration/simple-deployment-k8s-recommended-label/01-assert.yaml diff --git a/test/integration/simple-deployment-python-runtime/00-assert.yaml b/test/kuttl/integration/simple-deployment-python-runtime/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-python-runtime/00-assert.yaml rename to test/kuttl/integration/simple-deployment-python-runtime/00-assert.yaml diff --git a/test/integration/simple-deployment-python-runtime/00-install.yaml b/test/kuttl/integration/simple-deployment-python-runtime/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-python-runtime/00-install.yaml rename to test/kuttl/integration/simple-deployment-python-runtime/00-install.yaml diff --git a/test/integration/simple-deployment-python-runtime/00-teststep.yaml b/test/kuttl/integration/simple-deployment-python-runtime/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-python-runtime/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-python-runtime/00-teststep.yaml diff --git a/test/integration/simple-deployment-recursive-task/00-assert.yaml b/test/kuttl/integration/simple-deployment-recursive-task/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-recursive-task/00-assert.yaml rename to test/kuttl/integration/simple-deployment-recursive-task/00-assert.yaml diff --git a/test/integration/simple-deployment-recursive-task/00-install.yaml b/test/kuttl/integration/simple-deployment-recursive-task/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-recursive-task/00-install.yaml rename to test/kuttl/integration/simple-deployment-recursive-task/00-install.yaml diff --git a/test/integration/simple-deployment-recursive-task/00-teststep.yaml b/test/kuttl/integration/simple-deployment-recursive-task/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-recursive-task/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-recursive-task/00-teststep.yaml diff --git a/test/integration/simple-deployment-recursive-task/01-assert.yaml b/test/kuttl/integration/simple-deployment-recursive-task/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment-recursive-task/01-assert.yaml rename to test/kuttl/integration/simple-deployment-recursive-task/01-assert.yaml diff --git a/test/integration/simple-deployment-sanitize-version-number/00-assert.yaml b/test/kuttl/integration/simple-deployment-sanitize-version-number/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment-sanitize-version-number/00-assert.yaml rename to test/kuttl/integration/simple-deployment-sanitize-version-number/00-assert.yaml diff --git a/test/integration/simple-deployment-sanitize-version-number/00-install.yaml b/test/kuttl/integration/simple-deployment-sanitize-version-number/00-install.yaml similarity index 100% rename from test/integration/simple-deployment-sanitize-version-number/00-install.yaml rename to test/kuttl/integration/simple-deployment-sanitize-version-number/00-install.yaml diff --git a/test/integration/simple-deployment-sanitize-version-number/00-teststep.yaml b/test/kuttl/integration/simple-deployment-sanitize-version-number/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment-sanitize-version-number/00-teststep.yaml rename to test/kuttl/integration/simple-deployment-sanitize-version-number/00-teststep.yaml diff --git a/test/integration/simple-deployment-sanitize-version-number/01-assert.yaml b/test/kuttl/integration/simple-deployment-sanitize-version-number/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment-sanitize-version-number/01-assert.yaml rename to test/kuttl/integration/simple-deployment-sanitize-version-number/01-assert.yaml diff --git a/test/integration/simple-deployment/00-assert.yaml b/test/kuttl/integration/simple-deployment/00-assert.yaml similarity index 100% rename from test/integration/simple-deployment/00-assert.yaml rename to test/kuttl/integration/simple-deployment/00-assert.yaml diff --git a/test/integration/simple-deployment/00-install.yaml b/test/kuttl/integration/simple-deployment/00-install.yaml similarity index 100% rename from test/integration/simple-deployment/00-install.yaml rename to test/kuttl/integration/simple-deployment/00-install.yaml diff --git a/test/integration/simple-deployment/00-teststep.yaml b/test/kuttl/integration/simple-deployment/00-teststep.yaml similarity index 100% rename from test/integration/simple-deployment/00-teststep.yaml rename to test/kuttl/integration/simple-deployment/00-teststep.yaml diff --git a/test/integration/simple-deployment/01-assert.yaml b/test/kuttl/integration/simple-deployment/01-assert.yaml similarity index 100% rename from test/integration/simple-deployment/01-assert.yaml rename to test/kuttl/integration/simple-deployment/01-assert.yaml diff --git a/test/integration/simple-statefulset-annotated/00-assert.yaml b/test/kuttl/integration/simple-statefulset-annotated/00-assert.yaml similarity index 100% rename from test/integration/simple-statefulset-annotated/00-assert.yaml rename to test/kuttl/integration/simple-statefulset-annotated/00-assert.yaml diff --git a/test/integration/simple-statefulset-annotated/00-install.yaml b/test/kuttl/integration/simple-statefulset-annotated/00-install.yaml similarity index 100% rename from test/integration/simple-statefulset-annotated/00-install.yaml rename to test/kuttl/integration/simple-statefulset-annotated/00-install.yaml diff --git a/test/integration/simple-statefulset-annotated/00-teststep.yaml b/test/kuttl/integration/simple-statefulset-annotated/00-teststep.yaml similarity index 100% rename from test/integration/simple-statefulset-annotated/00-teststep.yaml rename to test/kuttl/integration/simple-statefulset-annotated/00-teststep.yaml diff --git a/test/integration/simple-statefulset-annotated/01-assert.yaml b/test/kuttl/integration/simple-statefulset-annotated/01-assert.yaml similarity index 100% rename from test/integration/simple-statefulset-annotated/01-assert.yaml rename to test/kuttl/integration/simple-statefulset-annotated/01-assert.yaml diff --git a/test/integration/simple-statefulset-annotated/02-assert.yaml b/test/kuttl/integration/simple-statefulset-annotated/02-assert.yaml similarity index 100% rename from test/integration/simple-statefulset-annotated/02-assert.yaml rename to test/kuttl/integration/simple-statefulset-annotated/02-assert.yaml diff --git a/test/integration/simple-statefulset-annotated/02-install.yaml b/test/kuttl/integration/simple-statefulset-annotated/02-install.yaml similarity index 100% rename from test/integration/simple-statefulset-annotated/02-install.yaml rename to test/kuttl/integration/simple-statefulset-annotated/02-install.yaml diff --git a/test/integration/simple-task/00-assert.yaml b/test/kuttl/integration/simple-task/00-assert.yaml similarity index 100% rename from test/integration/simple-task/00-assert.yaml rename to test/kuttl/integration/simple-task/00-assert.yaml diff --git a/test/integration/simple-task/00-install.yaml b/test/kuttl/integration/simple-task/00-install.yaml similarity index 100% rename from test/integration/simple-task/00-install.yaml rename to test/kuttl/integration/simple-task/00-install.yaml diff --git a/test/integration/simple-task/01-teststep.yaml b/test/kuttl/integration/simple-task/01-teststep.yaml similarity index 100% rename from test/integration/simple-task/01-teststep.yaml rename to test/kuttl/integration/simple-task/01-teststep.yaml diff --git a/test/integration/unsupported-owner-of-pod/00-assert.yaml b/test/kuttl/integration/unsupported-owner-of-pod/00-assert.yaml similarity index 100% rename from test/integration/unsupported-owner-of-pod/00-assert.yaml rename to test/kuttl/integration/unsupported-owner-of-pod/00-assert.yaml diff --git a/test/integration/unsupported-owner-of-pod/00-install.yaml b/test/kuttl/integration/unsupported-owner-of-pod/00-install.yaml similarity index 100% rename from test/integration/unsupported-owner-of-pod/00-install.yaml rename to test/kuttl/integration/unsupported-owner-of-pod/00-install.yaml diff --git a/test/integration/unsupported-owner-of-pod/00-teststep.yaml b/test/kuttl/integration/unsupported-owner-of-pod/00-teststep.yaml similarity index 100% rename from test/integration/unsupported-owner-of-pod/00-teststep.yaml rename to test/kuttl/integration/unsupported-owner-of-pod/00-teststep.yaml diff --git a/test/integration/validate-analysisdefinition/00-teststep-install.yaml b/test/kuttl/integration/validate-analysisdefinition/00-teststep-install.yaml similarity index 100% rename from test/integration/validate-analysisdefinition/00-teststep-install.yaml rename to test/kuttl/integration/validate-analysisdefinition/00-teststep-install.yaml diff --git a/test/integration/validate-analysisdefinition/01-teststep-assert.yaml b/test/kuttl/integration/validate-analysisdefinition/01-teststep-assert.yaml similarity index 100% rename from test/integration/validate-analysisdefinition/01-teststep-assert.yaml rename to test/kuttl/integration/validate-analysisdefinition/01-teststep-assert.yaml diff --git a/test/integration/validate-analysisdefinition/analysisdef_bad.yaml b/test/kuttl/integration/validate-analysisdefinition/analysisdef_bad.yaml similarity index 100% rename from test/integration/validate-analysisdefinition/analysisdef_bad.yaml rename to test/kuttl/integration/validate-analysisdefinition/analysisdef_bad.yaml diff --git a/test/integration/validate-analysisdefinition/analysisdef_good.yaml b/test/kuttl/integration/validate-analysisdefinition/analysisdef_good.yaml similarity index 100% rename from test/integration/validate-analysisdefinition/analysisdef_good.yaml rename to test/kuttl/integration/validate-analysisdefinition/analysisdef_good.yaml diff --git a/test/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml b/test/kuttl/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml similarity index 100% rename from test/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml rename to test/kuttl/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml diff --git a/test/integration/validate-taskdefinition/00-teststep-install.yaml b/test/kuttl/integration/validate-taskdefinition/00-teststep-install.yaml similarity index 100% rename from test/integration/validate-taskdefinition/00-teststep-install.yaml rename to test/kuttl/integration/validate-taskdefinition/00-teststep-install.yaml diff --git a/test/integration/validate-taskdefinition/01-teststep-assert.yaml b/test/kuttl/integration/validate-taskdefinition/01-teststep-assert.yaml similarity index 100% rename from test/integration/validate-taskdefinition/01-teststep-assert.yaml rename to test/kuttl/integration/validate-taskdefinition/01-teststep-assert.yaml diff --git a/test/integration/validate-taskdefinition/td_bad_container_deno.yaml b/test/kuttl/integration/validate-taskdefinition/td_bad_container_deno.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_bad_container_deno.yaml rename to test/kuttl/integration/validate-taskdefinition/td_bad_container_deno.yaml diff --git a/test/integration/validate-taskdefinition/td_bad_container_function.yaml b/test/kuttl/integration/validate-taskdefinition/td_bad_container_function.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_bad_container_function.yaml rename to test/kuttl/integration/validate-taskdefinition/td_bad_container_function.yaml diff --git a/test/integration/validate-taskdefinition/td_bad_container_python.yaml b/test/kuttl/integration/validate-taskdefinition/td_bad_container_python.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_bad_container_python.yaml rename to test/kuttl/integration/validate-taskdefinition/td_bad_container_python.yaml diff --git a/test/integration/validate-taskdefinition/td_bad_empty.yaml b/test/kuttl/integration/validate-taskdefinition/td_bad_empty.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_bad_empty.yaml rename to test/kuttl/integration/validate-taskdefinition/td_bad_empty.yaml diff --git a/test/integration/validate-taskdefinition/td_bad_function_deno.yaml b/test/kuttl/integration/validate-taskdefinition/td_bad_function_deno.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_bad_function_deno.yaml rename to test/kuttl/integration/validate-taskdefinition/td_bad_function_deno.yaml diff --git a/test/integration/validate-taskdefinition/td_bad_function_python.yaml b/test/kuttl/integration/validate-taskdefinition/td_bad_function_python.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_bad_function_python.yaml rename to test/kuttl/integration/validate-taskdefinition/td_bad_function_python.yaml diff --git a/test/integration/validate-taskdefinition/td_bad_python_deno.yaml b/test/kuttl/integration/validate-taskdefinition/td_bad_python_deno.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_bad_python_deno.yaml rename to test/kuttl/integration/validate-taskdefinition/td_bad_python_deno.yaml diff --git a/test/integration/validate-taskdefinition/td_good_container.yaml b/test/kuttl/integration/validate-taskdefinition/td_good_container.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_good_container.yaml rename to test/kuttl/integration/validate-taskdefinition/td_good_container.yaml diff --git a/test/integration/validate-taskdefinition/td_good_deno.yaml b/test/kuttl/integration/validate-taskdefinition/td_good_deno.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_good_deno.yaml rename to test/kuttl/integration/validate-taskdefinition/td_good_deno.yaml diff --git a/test/integration/validate-taskdefinition/td_good_function.yaml b/test/kuttl/integration/validate-taskdefinition/td_good_function.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_good_function.yaml rename to test/kuttl/integration/validate-taskdefinition/td_good_function.yaml diff --git a/test/integration/validate-taskdefinition/td_good_python.yaml b/test/kuttl/integration/validate-taskdefinition/td_good_python.yaml similarity index 100% rename from test/integration/validate-taskdefinition/td_good_python.yaml rename to test/kuttl/integration/validate-taskdefinition/td_good_python.yaml diff --git a/test/integration/workload-instance-failing-pre-task/00-assert.yaml b/test/kuttl/integration/workload-instance-failing-pre-task/00-assert.yaml similarity index 100% rename from test/integration/workload-instance-failing-pre-task/00-assert.yaml rename to test/kuttl/integration/workload-instance-failing-pre-task/00-assert.yaml diff --git a/test/integration/workload-instance-failing-pre-task/00-install.yaml b/test/kuttl/integration/workload-instance-failing-pre-task/00-install.yaml similarity index 100% rename from test/integration/workload-instance-failing-pre-task/00-install.yaml rename to test/kuttl/integration/workload-instance-failing-pre-task/00-install.yaml diff --git a/test/integration/workload-instance-failing-pre-task/00-teststep.yaml b/test/kuttl/integration/workload-instance-failing-pre-task/00-teststep.yaml similarity index 100% rename from test/integration/workload-instance-failing-pre-task/00-teststep.yaml rename to test/kuttl/integration/workload-instance-failing-pre-task/00-teststep.yaml diff --git a/test/integration/workload-instance-missing-evaluation/00-assert.yaml b/test/kuttl/integration/workload-instance-missing-evaluation/00-assert.yaml similarity index 100% rename from test/integration/workload-instance-missing-evaluation/00-assert.yaml rename to test/kuttl/integration/workload-instance-missing-evaluation/00-assert.yaml diff --git a/test/integration/workload-instance-missing-evaluation/00-install.yaml b/test/kuttl/integration/workload-instance-missing-evaluation/00-install.yaml similarity index 100% rename from test/integration/workload-instance-missing-evaluation/00-install.yaml rename to test/kuttl/integration/workload-instance-missing-evaluation/00-install.yaml diff --git a/test/integration/workload-instance-missing-evaluation/00-teststep.yaml b/test/kuttl/integration/workload-instance-missing-evaluation/00-teststep.yaml similarity index 100% rename from test/integration/workload-instance-missing-evaluation/00-teststep.yaml rename to test/kuttl/integration/workload-instance-missing-evaluation/00-teststep.yaml diff --git a/test/scheduling-gates/simple-deployment/00-assert.yaml b/test/kuttl/scheduling-gates/simple-deployment/00-assert.yaml similarity index 100% rename from test/scheduling-gates/simple-deployment/00-assert.yaml rename to test/kuttl/scheduling-gates/simple-deployment/00-assert.yaml diff --git a/test/scheduling-gates/simple-deployment/00-install.yaml b/test/kuttl/scheduling-gates/simple-deployment/00-install.yaml similarity index 100% rename from test/scheduling-gates/simple-deployment/00-install.yaml rename to test/kuttl/scheduling-gates/simple-deployment/00-install.yaml diff --git a/test/scheduling-gates/simple-deployment/00-teststep.yaml b/test/kuttl/scheduling-gates/simple-deployment/00-teststep.yaml similarity index 100% rename from test/scheduling-gates/simple-deployment/00-teststep.yaml rename to test/kuttl/scheduling-gates/simple-deployment/00-teststep.yaml diff --git a/test/scheduling-gates/simple-deployment/01-assert.yaml b/test/kuttl/scheduling-gates/simple-deployment/01-assert.yaml similarity index 100% rename from test/scheduling-gates/simple-deployment/01-assert.yaml rename to test/kuttl/scheduling-gates/simple-deployment/01-assert.yaml diff --git a/test/testanalysis/analysis-controller-existing-status/00-assert.yaml b/test/kuttl/testanalysis/analysis-controller-existing-status/00-assert.yaml similarity index 100% rename from test/testanalysis/analysis-controller-existing-status/00-assert.yaml rename to test/kuttl/testanalysis/analysis-controller-existing-status/00-assert.yaml diff --git a/test/testanalysis/analysis-controller-existing-status/00-install.yaml b/test/kuttl/testanalysis/analysis-controller-existing-status/00-install.yaml similarity index 100% rename from test/testanalysis/analysis-controller-existing-status/00-install.yaml rename to test/kuttl/testanalysis/analysis-controller-existing-status/00-install.yaml diff --git a/test/testanalysis/analysis-controller-existing-status/01-assert.yaml b/test/kuttl/testanalysis/analysis-controller-existing-status/01-assert.yaml similarity index 100% rename from test/testanalysis/analysis-controller-existing-status/01-assert.yaml rename to test/kuttl/testanalysis/analysis-controller-existing-status/01-assert.yaml diff --git a/test/testanalysis/analysis-controller-existing-status/01-install.yaml b/test/kuttl/testanalysis/analysis-controller-existing-status/01-install.yaml similarity index 100% rename from test/testanalysis/analysis-controller-existing-status/01-install.yaml rename to test/kuttl/testanalysis/analysis-controller-existing-status/01-install.yaml diff --git a/test/testanalysis/analysis-controller-existing-status/02-namespacedelete.yaml b/test/kuttl/testanalysis/analysis-controller-existing-status/02-namespacedelete.yaml similarity index 100% rename from test/testanalysis/analysis-controller-existing-status/02-namespacedelete.yaml rename to test/kuttl/testanalysis/analysis-controller-existing-status/02-namespacedelete.yaml diff --git a/test/testanalysis/analysis-controller-multiple-providers/00-teststep-template.yaml b/test/kuttl/testanalysis/analysis-controller-multiple-providers/00-teststep-template.yaml similarity index 100% rename from test/testanalysis/analysis-controller-multiple-providers/00-teststep-template.yaml rename to test/kuttl/testanalysis/analysis-controller-multiple-providers/00-teststep-template.yaml diff --git a/test/testanalysis/analysis-controller-multiple-providers/01-assert.yaml b/test/kuttl/testanalysis/analysis-controller-multiple-providers/01-assert.yaml similarity index 100% rename from test/testanalysis/analysis-controller-multiple-providers/01-assert.yaml rename to test/kuttl/testanalysis/analysis-controller-multiple-providers/01-assert.yaml diff --git a/test/testanalysis/analysis-controller-multiple-providers/install.yaml b/test/kuttl/testanalysis/analysis-controller-multiple-providers/install.yaml similarity index 100% rename from test/testanalysis/analysis-controller-multiple-providers/install.yaml rename to test/kuttl/testanalysis/analysis-controller-multiple-providers/install.yaml diff --git a/test/testanalysis/analysis-controller-multiple-providers/mock-server.yaml b/test/kuttl/testanalysis/analysis-controller-multiple-providers/mock-server.yaml similarity index 100% rename from test/testanalysis/analysis-controller-multiple-providers/mock-server.yaml rename to test/kuttl/testanalysis/analysis-controller-multiple-providers/mock-server.yaml diff --git a/test/testanalysis/analysis-controller-with-duration-timeframe/00-teststep-template.yaml b/test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/00-teststep-template.yaml similarity index 100% rename from test/testanalysis/analysis-controller-with-duration-timeframe/00-teststep-template.yaml rename to test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/00-teststep-template.yaml diff --git a/test/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml b/test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml similarity index 100% rename from test/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml rename to test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml diff --git a/test/testanalysis/analysis-controller-with-duration-timeframe/install.yaml b/test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/install.yaml similarity index 100% rename from test/testanalysis/analysis-controller-with-duration-timeframe/install.yaml rename to test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/install.yaml diff --git a/test/testanalysis/analysis-controller-with-duration-timeframe/mock-server.yaml b/test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/mock-server.yaml similarity index 100% rename from test/testanalysis/analysis-controller-with-duration-timeframe/mock-server.yaml rename to test/kuttl/testanalysis/analysis-controller-with-duration-timeframe/mock-server.yaml diff --git a/test/testanalysis/analysis-controller/00-teststep-template.yaml b/test/kuttl/testanalysis/analysis-controller/00-teststep-template.yaml similarity index 100% rename from test/testanalysis/analysis-controller/00-teststep-template.yaml rename to test/kuttl/testanalysis/analysis-controller/00-teststep-template.yaml diff --git a/test/testanalysis/analysis-controller/01-assert.yaml b/test/kuttl/testanalysis/analysis-controller/01-assert.yaml similarity index 100% rename from test/testanalysis/analysis-controller/01-assert.yaml rename to test/kuttl/testanalysis/analysis-controller/01-assert.yaml diff --git a/test/testanalysis/analysis-controller/install.yaml b/test/kuttl/testanalysis/analysis-controller/install.yaml similarity index 100% rename from test/testanalysis/analysis-controller/install.yaml rename to test/kuttl/testanalysis/analysis-controller/install.yaml diff --git a/test/testanalysis/analysis-controller/mock-server.yaml b/test/kuttl/testanalysis/analysis-controller/mock-server.yaml similarity index 100% rename from test/testanalysis/analysis-controller/mock-server.yaml rename to test/kuttl/testanalysis/analysis-controller/mock-server.yaml diff --git a/test/testanalysis/analysis-resources/00-teststep-install.yaml b/test/kuttl/testanalysis/analysis-resources/00-teststep-install.yaml similarity index 100% rename from test/testanalysis/analysis-resources/00-teststep-install.yaml rename to test/kuttl/testanalysis/analysis-resources/00-teststep-install.yaml diff --git a/test/testanalysis/analysis-resources/01-teststep-assert.yaml b/test/kuttl/testanalysis/analysis-resources/01-teststep-assert.yaml similarity index 100% rename from test/testanalysis/analysis-resources/01-teststep-assert.yaml rename to test/kuttl/testanalysis/analysis-resources/01-teststep-assert.yaml diff --git a/test/testanalysis/analysis-resources/invalid-analysis-1.yaml b/test/kuttl/testanalysis/analysis-resources/invalid-analysis-1.yaml similarity index 100% rename from test/testanalysis/analysis-resources/invalid-analysis-1.yaml rename to test/kuttl/testanalysis/analysis-resources/invalid-analysis-1.yaml diff --git a/test/testanalysis/analysis-resources/invalid-analysis-2.yaml b/test/kuttl/testanalysis/analysis-resources/invalid-analysis-2.yaml similarity index 100% rename from test/testanalysis/analysis-resources/invalid-analysis-2.yaml rename to test/kuttl/testanalysis/analysis-resources/invalid-analysis-2.yaml diff --git a/test/testanalysis/analysis-resources/invalid-analysis-3.yaml b/test/kuttl/testanalysis/analysis-resources/invalid-analysis-3.yaml similarity index 100% rename from test/testanalysis/analysis-resources/invalid-analysis-3.yaml rename to test/kuttl/testanalysis/analysis-resources/invalid-analysis-3.yaml diff --git a/test/testanalysis/analysis-resources/valid-analysis-1.yaml b/test/kuttl/testanalysis/analysis-resources/valid-analysis-1.yaml similarity index 100% rename from test/testanalysis/analysis-resources/valid-analysis-1.yaml rename to test/kuttl/testanalysis/analysis-resources/valid-analysis-1.yaml diff --git a/test/testanalysis/analysis-resources/valid-analysis-2.yaml b/test/kuttl/testanalysis/analysis-resources/valid-analysis-2.yaml similarity index 100% rename from test/testanalysis/analysis-resources/valid-analysis-2.yaml rename to test/kuttl/testanalysis/analysis-resources/valid-analysis-2.yaml diff --git a/test/testanalysis/analysis-value-template/00-assert.yaml b/test/kuttl/testanalysis/analysis-value-template/00-assert.yaml similarity index 100% rename from test/testanalysis/analysis-value-template/00-assert.yaml rename to test/kuttl/testanalysis/analysis-value-template/00-assert.yaml diff --git a/test/testanalysis/analysis-value-template/00-install.yaml b/test/kuttl/testanalysis/analysis-value-template/00-install.yaml similarity index 100% rename from test/testanalysis/analysis-value-template/00-install.yaml rename to test/kuttl/testanalysis/analysis-value-template/00-install.yaml diff --git a/test/testanalysis/analysisdefinition-validate/00-teststep-install.yaml b/test/kuttl/testanalysis/analysisdefinition-validate/00-teststep-install.yaml similarity index 100% rename from test/testanalysis/analysisdefinition-validate/00-teststep-install.yaml rename to test/kuttl/testanalysis/analysisdefinition-validate/00-teststep-install.yaml diff --git a/test/testanalysis/analysisdefinition-validate/01-teststep-assert.yaml b/test/kuttl/testanalysis/analysisdefinition-validate/01-teststep-assert.yaml similarity index 100% rename from test/testanalysis/analysisdefinition-validate/01-teststep-assert.yaml rename to test/kuttl/testanalysis/analysisdefinition-validate/01-teststep-assert.yaml diff --git a/test/testanalysis/analysisdefinition-validate/badanalysis.yaml b/test/kuttl/testanalysis/analysisdefinition-validate/badanalysis.yaml similarity index 100% rename from test/testanalysis/analysisdefinition-validate/badanalysis.yaml rename to test/kuttl/testanalysis/analysisdefinition-validate/badanalysis.yaml diff --git a/test/testanalysis/analysisdefinition-validate/goodanalysis.yaml b/test/kuttl/testanalysis/analysisdefinition-validate/goodanalysis.yaml similarity index 100% rename from test/testanalysis/analysisdefinition-validate/goodanalysis.yaml rename to test/kuttl/testanalysis/analysisdefinition-validate/goodanalysis.yaml diff --git a/test/testcertificate/cert-recreates/00-assert.yaml b/test/kuttl/testcertificate/cert-recreates/00-assert.yaml similarity index 100% rename from test/testcertificate/cert-recreates/00-assert.yaml rename to test/kuttl/testcertificate/cert-recreates/00-assert.yaml diff --git a/test/testcertificate/cert-recreates/00-teststep.yaml b/test/kuttl/testcertificate/cert-recreates/00-teststep.yaml similarity index 100% rename from test/testcertificate/cert-recreates/00-teststep.yaml rename to test/kuttl/testcertificate/cert-recreates/00-teststep.yaml diff --git a/test/testcertificate/cert-recreates/01-assert.yaml b/test/kuttl/testcertificate/cert-recreates/01-assert.yaml similarity index 100% rename from test/testcertificate/cert-recreates/01-assert.yaml rename to test/kuttl/testcertificate/cert-recreates/01-assert.yaml diff --git a/test/testcertificate/cert-recreates/01-delete.yaml b/test/kuttl/testcertificate/cert-recreates/01-delete.yaml similarity index 100% rename from test/testcertificate/cert-recreates/01-delete.yaml rename to test/kuttl/testcertificate/cert-recreates/01-delete.yaml diff --git a/test/testcertificate/cert-recreates/02-assert.yaml b/test/kuttl/testcertificate/cert-recreates/02-assert.yaml similarity index 100% rename from test/testcertificate/cert-recreates/02-assert.yaml rename to test/kuttl/testcertificate/cert-recreates/02-assert.yaml diff --git a/test/testcertificate/cert-recreates/02-install.yaml b/test/kuttl/testcertificate/cert-recreates/02-install.yaml similarity index 100% rename from test/testcertificate/cert-recreates/02-install.yaml rename to test/kuttl/testcertificate/cert-recreates/02-install.yaml diff --git a/test/testcertificate/cert-recreates/02-teststep.yaml b/test/kuttl/testcertificate/cert-recreates/02-teststep.yaml similarity index 100% rename from test/testcertificate/cert-recreates/02-teststep.yaml rename to test/kuttl/testcertificate/cert-recreates/02-teststep.yaml diff --git a/test/testmetrics/metrics-hpa/00-install.yaml b/test/kuttl/testmetrics/metrics-hpa/00-install.yaml similarity index 100% rename from test/testmetrics/metrics-hpa/00-install.yaml rename to test/kuttl/testmetrics/metrics-hpa/00-install.yaml diff --git a/test/testmetrics/metrics-hpa/00-teststep-template.yaml b/test/kuttl/testmetrics/metrics-hpa/00-teststep-template.yaml similarity index 100% rename from test/testmetrics/metrics-hpa/00-teststep-template.yaml rename to test/kuttl/testmetrics/metrics-hpa/00-teststep-template.yaml diff --git a/test/testmetrics/metrics-hpa/01-assert.yaml b/test/kuttl/testmetrics/metrics-hpa/01-assert.yaml similarity index 100% rename from test/testmetrics/metrics-hpa/01-assert.yaml rename to test/kuttl/testmetrics/metrics-hpa/01-assert.yaml diff --git a/test/testmetrics/metrics-hpa/deployment.yaml b/test/kuttl/testmetrics/metrics-hpa/deployment.yaml similarity index 100% rename from test/testmetrics/metrics-hpa/deployment.yaml rename to test/kuttl/testmetrics/metrics-hpa/deployment.yaml diff --git a/test/testmetrics/metrics-hpa/hpa.yaml b/test/kuttl/testmetrics/metrics-hpa/hpa.yaml similarity index 100% rename from test/testmetrics/metrics-hpa/hpa.yaml rename to test/kuttl/testmetrics/metrics-hpa/hpa.yaml diff --git a/test/testmetrics/metrics-hpa/metric.yaml b/test/kuttl/testmetrics/metrics-hpa/metric.yaml similarity index 100% rename from test/testmetrics/metrics-hpa/metric.yaml rename to test/kuttl/testmetrics/metrics-hpa/metric.yaml diff --git a/test/testmetrics/metrics-hpa/mock-server.yaml b/test/kuttl/testmetrics/metrics-hpa/mock-server.yaml similarity index 100% rename from test/testmetrics/metrics-hpa/mock-server.yaml rename to test/kuttl/testmetrics/metrics-hpa/mock-server.yaml diff --git a/test/testmetrics/metrics-provider/00-install.yaml b/test/kuttl/testmetrics/metrics-provider/00-install.yaml similarity index 100% rename from test/testmetrics/metrics-provider/00-install.yaml rename to test/kuttl/testmetrics/metrics-provider/00-install.yaml diff --git a/test/testmetrics/metrics-provider/01-test-logs.yaml b/test/kuttl/testmetrics/metrics-provider/01-test-logs.yaml similarity index 100% rename from test/testmetrics/metrics-provider/01-test-logs.yaml rename to test/kuttl/testmetrics/metrics-provider/01-test-logs.yaml diff --git a/test/testmetrics/metrics-provider/logs.sh b/test/kuttl/testmetrics/metrics-provider/logs.sh similarity index 100% rename from test/testmetrics/metrics-provider/logs.sh rename to test/kuttl/testmetrics/metrics-provider/logs.sh diff --git a/test/testmetrics/metrics/00-install.yaml b/test/kuttl/testmetrics/metrics/00-install.yaml similarity index 100% rename from test/testmetrics/metrics/00-install.yaml rename to test/kuttl/testmetrics/metrics/00-install.yaml diff --git a/test/testmetrics/metrics/01-teststep-install.yaml b/test/kuttl/testmetrics/metrics/01-teststep-install.yaml similarity index 100% rename from test/testmetrics/metrics/01-teststep-install.yaml rename to test/kuttl/testmetrics/metrics/01-teststep-install.yaml diff --git a/test/testmetrics/metrics/02-teststep-assert.yaml b/test/kuttl/testmetrics/metrics/02-teststep-assert.yaml similarity index 100% rename from test/testmetrics/metrics/02-teststep-assert.yaml rename to test/kuttl/testmetrics/metrics/02-teststep-assert.yaml diff --git a/test/testmetrics/metrics/03-teststep-retrieve-metrics-via-api.yaml b/test/kuttl/testmetrics/metrics/03-teststep-retrieve-metrics-via-api.yaml similarity index 100% rename from test/testmetrics/metrics/03-teststep-retrieve-metrics-via-api.yaml rename to test/kuttl/testmetrics/metrics/03-teststep-retrieve-metrics-via-api.yaml diff --git a/test/testmetrics/metrics/04-teststep-check-active-metrics.yaml b/test/kuttl/testmetrics/metrics/04-teststep-check-active-metrics.yaml similarity index 100% rename from test/testmetrics/metrics/04-teststep-check-active-metrics.yaml rename to test/kuttl/testmetrics/metrics/04-teststep-check-active-metrics.yaml diff --git a/test/testmetrics/metrics/badmetric1.yaml b/test/kuttl/testmetrics/metrics/badmetric1.yaml similarity index 100% rename from test/testmetrics/metrics/badmetric1.yaml rename to test/kuttl/testmetrics/metrics/badmetric1.yaml diff --git a/test/testmetrics/metrics/badmetric2.yaml b/test/kuttl/testmetrics/metrics/badmetric2.yaml similarity index 100% rename from test/testmetrics/metrics/badmetric2.yaml rename to test/kuttl/testmetrics/metrics/badmetric2.yaml diff --git a/test/testmetrics/metrics/badmetric3.yaml b/test/kuttl/testmetrics/metrics/badmetric3.yaml similarity index 100% rename from test/testmetrics/metrics/badmetric3.yaml rename to test/kuttl/testmetrics/metrics/badmetric3.yaml diff --git a/test/testmetrics/metrics/check-active-metrics.sh b/test/kuttl/testmetrics/metrics/check-active-metrics.sh similarity index 100% rename from test/testmetrics/metrics/check-active-metrics.sh rename to test/kuttl/testmetrics/metrics/check-active-metrics.sh diff --git a/test/testmetrics/metrics/goodmetric1.yaml b/test/kuttl/testmetrics/metrics/goodmetric1.yaml similarity index 100% rename from test/testmetrics/metrics/goodmetric1.yaml rename to test/kuttl/testmetrics/metrics/goodmetric1.yaml diff --git a/test/testmetrics/metrics/goodmetric2.yaml b/test/kuttl/testmetrics/metrics/goodmetric2.yaml similarity index 100% rename from test/testmetrics/metrics/goodmetric2.yaml rename to test/kuttl/testmetrics/metrics/goodmetric2.yaml diff --git a/test/testmetrics/metrics/goodmetric3.yaml b/test/kuttl/testmetrics/metrics/goodmetric3.yaml similarity index 100% rename from test/testmetrics/metrics/goodmetric3.yaml rename to test/kuttl/testmetrics/metrics/goodmetric3.yaml diff --git a/test/testmetrics/metrics/goodmetric4.yaml b/test/kuttl/testmetrics/metrics/goodmetric4.yaml similarity index 100% rename from test/testmetrics/metrics/goodmetric4.yaml rename to test/kuttl/testmetrics/metrics/goodmetric4.yaml diff --git a/test/testmetrics/metrics/goodmetric5.yaml b/test/kuttl/testmetrics/metrics/goodmetric5.yaml similarity index 100% rename from test/testmetrics/metrics/goodmetric5.yaml rename to test/kuttl/testmetrics/metrics/goodmetric5.yaml diff --git a/test/testmetrics/metrics/goodmetric6.yaml b/test/kuttl/testmetrics/metrics/goodmetric6.yaml similarity index 100% rename from test/testmetrics/metrics/goodmetric6.yaml rename to test/kuttl/testmetrics/metrics/goodmetric6.yaml diff --git a/test/testmetrics/metrics/retrieve-metrics.sh b/test/kuttl/testmetrics/metrics/retrieve-metrics.sh similarity index 100% rename from test/testmetrics/metrics/retrieve-metrics.sh rename to test/kuttl/testmetrics/metrics/retrieve-metrics.sh