From 8d3000ead69556f18a6d7e909468015ff636cf66 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Tue, 5 Sep 2023 12:16:16 +0200 Subject: [PATCH] Move the instrumentation E2E tests to their own folder (#2084) Signed-off-by: Israel Blancas --- .github/workflows/e2e.yaml | 1 + Makefile | 6 ++++++ kuttl-test-instrumentation.yaml | 5 +++++ .../instrumentation-apache-httpd/00-install-collector.yaml | 0 .../00-install-instrumentation.yaml | 0 .../instrumentation-apache-httpd/01-assert.yaml | 0 .../instrumentation-apache-httpd/01-install-app.yaml | 4 ++++ .../00-install-collector.yaml | 0 .../00-install-instrumentation.yaml | 0 .../instrumentation-apache-multicontainer/01-assert.yaml | 0 .../01-install-app.yaml | 0 .../instrumentation-apache-multicontainer/02-assert.yaml | 0 .../02-install-app.yaml | 0 .../00-install-collector.yaml | 0 .../00-install-instrumentation.yaml | 0 .../instrumentation-dotnet-multicontainer/01-assert.yaml | 0 .../01-install-app.yaml | 0 .../instrumentation-dotnet-multicontainer/02-assert.yaml | 0 .../02-install-app.yaml | 0 .../instrumentation-dotnet/00-install-collector.yaml | 0 .../instrumentation-dotnet/00-install-instrumentation.yaml | 0 .../instrumentation-dotnet/01-assert.yaml | 0 .../instrumentation-dotnet/01-install-app.yaml | 0 .../instrumentation-go/00-install-collector.yaml | 0 .../instrumentation-go/00-install-instrumentation.yaml | 0 .../instrumentation-go/01-add-scc.yaml | 0 .../instrumentation-go/02-assert.yaml | 0 .../instrumentation-go/02-install-app.yaml | 0 .../instrumentation-go/add-scc.sh | 0 .../instrumentation-go/scc.yaml | 0 .../00-install-collector.yaml | 0 .../00-install-instrumentation.yaml | 0 .../instrumentation-java-multicontainer/01-assert.yaml | 0 .../instrumentation-java-multicontainer/01-install-app.yaml | 0 .../instrumentation-java-multicontainer/02-assert.yaml | 0 .../instrumentation-java-multicontainer/02-install-app.yaml | 0 .../instrumentation-java-other-ns/01-cleanup-other-ns.yaml | 0 .../instrumentation-java-other-ns/02-install-collector.yaml | 0 .../02-install-instrumentation.yaml | 0 .../instrumentation-java-other-ns/03-assert.yaml | 0 .../instrumentation-java-other-ns/03-install-app.yaml | 0 .../instrumentation-java-other-ns/04-cleanup-other-ns.yaml | 0 .../instrumentation-java/00-install-collector.yaml | 0 .../instrumentation-java/00-install-instrumentation.yaml | 0 .../instrumentation-java/01-assert.yaml | 0 .../instrumentation-java/01-install-app.yaml | 0 .../00-install-collector.yaml | 0 .../00-install-instrumentation.yaml | 0 .../instrumentation-nodejs-multicontainer/01-assert.yaml | 0 .../01-install-app.yaml | 0 .../instrumentation-nodejs-multicontainer/02-assert.yaml | 0 .../02-install-app.yaml | 0 .../instrumentation-nodejs/00-install-collector.yaml | 0 .../instrumentation-nodejs/00-install-instrumentation.yaml | 0 .../instrumentation-nodejs/01-assert.yaml | 0 .../instrumentation-nodejs/01-install-app.yaml | 0 .../00-install-collector.yaml | 0 .../00-install-instrumentation.yaml | 0 .../instrumentation-python-multicontainer/01-assert.yaml | 0 .../01-install-app.yaml | 0 .../instrumentation-python-multicontainer/02-assert.yaml | 0 .../02-install-app.yaml | 0 .../instrumentation-python/00-install-collector.yaml | 0 .../instrumentation-python/00-install-instrumentation.yaml | 0 .../instrumentation-python/01-assert.yaml | 0 .../instrumentation-python/01-install-app.yaml | 0 .../instrumentation-sdk/00-install-collector.yaml | 0 .../instrumentation-sdk/00-install-instrumentation.yaml | 0 .../instrumentation-sdk/01-assert.yaml | 0 .../instrumentation-sdk/01-install-app.yaml | 0 70 files changed, 16 insertions(+) create mode 100644 kuttl-test-instrumentation.yaml rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-httpd/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-httpd/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-httpd/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-httpd/01-install-app.yaml (90%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-multicontainer/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-multicontainer/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-multicontainer/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-multicontainer/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-multicontainer/02-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-apache-multicontainer/02-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet-multicontainer/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet-multicontainer/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet-multicontainer/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet-multicontainer/02-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet-multicontainer/02-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-dotnet/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-go/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-go/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-go/01-add-scc.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-go/02-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-go/02-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-go/add-scc.sh (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-go/scc.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-multicontainer/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-multicontainer/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-multicontainer/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-multicontainer/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-multicontainer/02-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-multicontainer/02-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-other-ns/01-cleanup-other-ns.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-other-ns/02-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-other-ns/02-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-other-ns/03-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-other-ns/03-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java-other-ns/04-cleanup-other-ns.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-java/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs-multicontainer/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs-multicontainer/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs-multicontainer/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs-multicontainer/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs-multicontainer/02-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs-multicontainer/02-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-nodejs/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python-multicontainer/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python-multicontainer/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python-multicontainer/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python-multicontainer/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python-multicontainer/02-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python-multicontainer/02-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-python/01-install-app.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-sdk/00-install-collector.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-sdk/00-install-instrumentation.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-sdk/01-assert.yaml (100%) rename tests/{e2e => e2e-instrumentation}/instrumentation-sdk/01-install-app.yaml (100%) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 0d31f7c116..47138c2965 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -29,6 +29,7 @@ jobs: - "1.28" group: - e2e + - e2e-instrumentation - e2e-upgrade - e2e-prometheuscr - e2e-autoscale diff --git a/Makefile b/Makefile index e92c525372..a61d956966 100644 --- a/Makefile +++ b/Makefile @@ -176,6 +176,12 @@ generate: controller-gen api-docs e2e: $(KUTTL) test + +# instrumentation end-to-tests +.PHONY: e2e-instrumentation +e2e-instrumentation: + $(KUTTL) test --config kuttl-test-instrumentation.yaml + # end-to-end-test for PrometheusCR E2E tests .PHONY: e2e-prometheuscr e2e-prometheuscr: diff --git a/kuttl-test-instrumentation.yaml b/kuttl-test-instrumentation.yaml new file mode 100644 index 0000000000..545357c420 --- /dev/null +++ b/kuttl-test-instrumentation.yaml @@ -0,0 +1,5 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestSuite +testDirs: + - ./tests/e2e-instrumentation/ +timeout: 300 diff --git a/tests/e2e/instrumentation-apache-httpd/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-apache-httpd/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-httpd/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-apache-httpd/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-apache-httpd/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-apache-httpd/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-httpd/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-apache-httpd/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-apache-httpd/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-apache-httpd/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-httpd/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-apache-httpd/01-assert.yaml diff --git a/tests/e2e/instrumentation-apache-httpd/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-apache-httpd/01-install-app.yaml similarity index 90% rename from tests/e2e/instrumentation-apache-httpd/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-apache-httpd/01-install-app.yaml index 0edb9c9e1c..fcad1439a7 100644 --- a/tests/e2e/instrumentation-apache-httpd/01-install-app.yaml +++ b/tests/e2e-instrumentation/instrumentation-apache-httpd/01-install-app.yaml @@ -15,6 +15,10 @@ spec: sidecar.opentelemetry.io/inject: "true" instrumentation.opentelemetry.io/inject-apache-httpd: "true" spec: + securityContext: + runAsUser: 1000 + runAsGroup: 3000 + fsGroup: 2000 containers: - name: myapp image: docker.io/chrlic/apache-test@sha256:fad58c6ce7a4f477b455bece2a1980741fa6f81cef1e1093a3b72f9b2ffa7b8e diff --git a/tests/e2e/instrumentation-apache-multicontainer/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-multicontainer/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-apache-multicontainer/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-apache-multicontainer/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-multicontainer/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-apache-multicontainer/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-apache-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-multicontainer/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-assert.yaml diff --git a/tests/e2e/instrumentation-apache-multicontainer/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-multicontainer/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-install-app.yaml diff --git a/tests/e2e/instrumentation-apache-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-multicontainer/02-assert.yaml rename to tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-assert.yaml diff --git a/tests/e2e/instrumentation-apache-multicontainer/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-apache-multicontainer/02-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-install-app.yaml diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet-multicontainer/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-assert.yaml diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-install-app.yaml diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-assert.yaml diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-install-app.yaml diff --git a/tests/e2e/instrumentation-dotnet/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-dotnet/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-dotnet/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-dotnet/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-dotnet/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-dotnet/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet/01-assert.yaml diff --git a/tests/e2e/instrumentation-dotnet/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-dotnet/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-dotnet/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-dotnet/01-install-app.yaml diff --git a/tests/e2e/instrumentation-go/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-go/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-go/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-go/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-go/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-go/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-go/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-go/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-go/01-add-scc.yaml b/tests/e2e-instrumentation/instrumentation-go/01-add-scc.yaml similarity index 100% rename from tests/e2e/instrumentation-go/01-add-scc.yaml rename to tests/e2e-instrumentation/instrumentation-go/01-add-scc.yaml diff --git a/tests/e2e/instrumentation-go/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-go/02-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-go/02-assert.yaml rename to tests/e2e-instrumentation/instrumentation-go/02-assert.yaml diff --git a/tests/e2e/instrumentation-go/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-go/02-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-go/02-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-go/02-install-app.yaml diff --git a/tests/e2e/instrumentation-go/add-scc.sh b/tests/e2e-instrumentation/instrumentation-go/add-scc.sh similarity index 100% rename from tests/e2e/instrumentation-go/add-scc.sh rename to tests/e2e-instrumentation/instrumentation-go/add-scc.sh diff --git a/tests/e2e/instrumentation-go/scc.yaml b/tests/e2e-instrumentation/instrumentation-go/scc.yaml similarity index 100% rename from tests/e2e/instrumentation-go/scc.yaml rename to tests/e2e-instrumentation/instrumentation-go/scc.yaml diff --git a/tests/e2e/instrumentation-java-multicontainer/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-java-multicontainer/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-java-multicontainer/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-java-multicontainer/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-java-multicontainer/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-java-multicontainer/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-java-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-java-multicontainer/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-java-multicontainer/01-assert.yaml diff --git a/tests/e2e/instrumentation-java-multicontainer/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-java-multicontainer/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-java-multicontainer/01-install-app.yaml diff --git a/tests/e2e/instrumentation-java-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/02-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-java-multicontainer/02-assert.yaml rename to tests/e2e-instrumentation/instrumentation-java-multicontainer/02-assert.yaml diff --git a/tests/e2e/instrumentation-java-multicontainer/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/02-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-java-multicontainer/02-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-java-multicontainer/02-install-app.yaml diff --git a/tests/e2e/instrumentation-java-other-ns/01-cleanup-other-ns.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/01-cleanup-other-ns.yaml similarity index 100% rename from tests/e2e/instrumentation-java-other-ns/01-cleanup-other-ns.yaml rename to tests/e2e-instrumentation/instrumentation-java-other-ns/01-cleanup-other-ns.yaml diff --git a/tests/e2e/instrumentation-java-other-ns/02-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/02-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-java-other-ns/02-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-java-other-ns/02-install-collector.yaml diff --git a/tests/e2e/instrumentation-java-other-ns/02-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/02-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-java-other-ns/02-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-java-other-ns/02-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-java-other-ns/03-assert.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/03-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-java-other-ns/03-assert.yaml rename to tests/e2e-instrumentation/instrumentation-java-other-ns/03-assert.yaml diff --git a/tests/e2e/instrumentation-java-other-ns/03-install-app.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/03-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-java-other-ns/03-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-java-other-ns/03-install-app.yaml diff --git a/tests/e2e/instrumentation-java-other-ns/04-cleanup-other-ns.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/04-cleanup-other-ns.yaml similarity index 100% rename from tests/e2e/instrumentation-java-other-ns/04-cleanup-other-ns.yaml rename to tests/e2e-instrumentation/instrumentation-java-other-ns/04-cleanup-other-ns.yaml diff --git a/tests/e2e/instrumentation-java/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-java/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-java/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-java/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-java/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-java/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-java/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-java/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-java/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-java/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-java/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-java/01-assert.yaml diff --git a/tests/e2e/instrumentation-java/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-java/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-java/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-java/01-install-app.yaml diff --git a/tests/e2e/instrumentation-nodejs-multicontainer/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs-multicontainer/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-nodejs-multicontainer/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs-multicontainer/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-nodejs-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs-multicontainer/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-assert.yaml diff --git a/tests/e2e/instrumentation-nodejs-multicontainer/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs-multicontainer/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-install-app.yaml diff --git a/tests/e2e/instrumentation-nodejs-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs-multicontainer/02-assert.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-assert.yaml diff --git a/tests/e2e/instrumentation-nodejs-multicontainer/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs-multicontainer/02-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-install-app.yaml diff --git a/tests/e2e/instrumentation-nodejs/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-nodejs/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-nodejs/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-nodejs/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-nodejs/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nodejs/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs/01-assert.yaml diff --git a/tests/e2e/instrumentation-nodejs/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nodejs/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-nodejs/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-nodejs/01-install-app.yaml diff --git a/tests/e2e/instrumentation-python-multicontainer/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-python-multicontainer/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-python-multicontainer/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-python-multicontainer/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-python-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-python-multicontainer/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-python-multicontainer/01-assert.yaml diff --git a/tests/e2e/instrumentation-python-multicontainer/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-python-multicontainer/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-python-multicontainer/01-install-app.yaml diff --git a/tests/e2e/instrumentation-python-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/02-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-python-multicontainer/02-assert.yaml rename to tests/e2e-instrumentation/instrumentation-python-multicontainer/02-assert.yaml diff --git a/tests/e2e/instrumentation-python-multicontainer/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/02-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-python-multicontainer/02-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-python-multicontainer/02-install-app.yaml diff --git a/tests/e2e/instrumentation-python/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-python/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-python/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-python/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-python/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-python/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-python/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-python/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-python/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-python/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-python/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-python/01-assert.yaml diff --git a/tests/e2e/instrumentation-python/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-python/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-python/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-python/01-install-app.yaml diff --git a/tests/e2e/instrumentation-sdk/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-sdk/00-install-collector.yaml similarity index 100% rename from tests/e2e/instrumentation-sdk/00-install-collector.yaml rename to tests/e2e-instrumentation/instrumentation-sdk/00-install-collector.yaml diff --git a/tests/e2e/instrumentation-sdk/00-install-instrumentation.yaml b/tests/e2e-instrumentation/instrumentation-sdk/00-install-instrumentation.yaml similarity index 100% rename from tests/e2e/instrumentation-sdk/00-install-instrumentation.yaml rename to tests/e2e-instrumentation/instrumentation-sdk/00-install-instrumentation.yaml diff --git a/tests/e2e/instrumentation-sdk/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-sdk/01-assert.yaml similarity index 100% rename from tests/e2e/instrumentation-sdk/01-assert.yaml rename to tests/e2e-instrumentation/instrumentation-sdk/01-assert.yaml diff --git a/tests/e2e/instrumentation-sdk/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-sdk/01-install-app.yaml similarity index 100% rename from tests/e2e/instrumentation-sdk/01-install-app.yaml rename to tests/e2e-instrumentation/instrumentation-sdk/01-install-app.yaml