Move the instrumentation E2E tests to their own folder (#2084)

Signed-off-by: Israel Blancas <[email protected]>
open-telemetry · Sep 5, 2023 · 8d3000e · 8d3000e
1 parent 2bdbe77
commit 8d3000e
Show file tree

Hide file tree

Showing 70 changed files with 16 additions and 0 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestSuite
+testDirs:
+  - ./tests/e2e-instrumentation/
+timeout: 300
diff --git a/...on-apache-httpd/00-install-collector.yaml → ...on-apache-httpd/00-install-collector.yaml b/...on-apache-httpd/00-install-collector.yaml → ...on-apache-httpd/00-install-collector.yaml
diff --git a/...che-httpd/00-install-instrumentation.yaml → ...che-httpd/00-install-instrumentation.yaml b/...che-httpd/00-install-instrumentation.yaml → ...che-httpd/00-install-instrumentation.yaml
diff --git a/...strumentation-apache-httpd/01-assert.yaml → ...strumentation-apache-httpd/01-assert.yaml b/...strumentation-apache-httpd/01-assert.yaml → ...strumentation-apache-httpd/01-assert.yaml
diff --git a/...entation-apache-httpd/01-install-app.yaml → ...entation-apache-httpd/01-install-app.yaml b/...entation-apache-httpd/01-install-app.yaml → ...entation-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/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml b/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml
diff --git a/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml b/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml
diff --git a/...tion-apache-multicontainer/01-assert.yaml → ...tion-apache-multicontainer/01-assert.yaml b/...tion-apache-multicontainer/01-assert.yaml → ...tion-apache-multicontainer/01-assert.yaml
diff --git a/...apache-multicontainer/01-install-app.yaml → ...apache-multicontainer/01-install-app.yaml b/...apache-multicontainer/01-install-app.yaml → ...apache-multicontainer/01-install-app.yaml
diff --git a/...tion-apache-multicontainer/02-assert.yaml → ...tion-apache-multicontainer/02-assert.yaml b/...tion-apache-multicontainer/02-assert.yaml → ...tion-apache-multicontainer/02-assert.yaml
diff --git a/...apache-multicontainer/02-install-app.yaml → ...apache-multicontainer/02-install-app.yaml b/...apache-multicontainer/02-install-app.yaml → ...apache-multicontainer/02-install-app.yaml
diff --git a/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml b/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml
diff --git a/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml b/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml
diff --git a/...tion-dotnet-multicontainer/01-assert.yaml → ...tion-dotnet-multicontainer/01-assert.yaml b/...tion-dotnet-multicontainer/01-assert.yaml → ...tion-dotnet-multicontainer/01-assert.yaml
diff --git a/...dotnet-multicontainer/01-install-app.yaml → ...dotnet-multicontainer/01-install-app.yaml b/...dotnet-multicontainer/01-install-app.yaml → ...dotnet-multicontainer/01-install-app.yaml
diff --git a/...tion-dotnet-multicontainer/02-assert.yaml → ...tion-dotnet-multicontainer/02-assert.yaml b/...tion-dotnet-multicontainer/02-assert.yaml → ...tion-dotnet-multicontainer/02-assert.yaml
diff --git a/...dotnet-multicontainer/02-install-app.yaml → ...dotnet-multicontainer/02-install-app.yaml b/...dotnet-multicontainer/02-install-app.yaml → ...dotnet-multicontainer/02-install-app.yaml
diff --git a/...entation-dotnet/00-install-collector.yaml → ...entation-dotnet/00-install-collector.yaml b/...entation-dotnet/00-install-collector.yaml → ...entation-dotnet/00-install-collector.yaml
diff --git a/...on-dotnet/00-install-instrumentation.yaml → ...on-dotnet/00-install-instrumentation.yaml b/...on-dotnet/00-install-instrumentation.yaml → ...on-dotnet/00-install-instrumentation.yaml
diff --git a/...e2e/instrumentation-dotnet/01-assert.yaml → ...ion/instrumentation-dotnet/01-assert.yaml b/...e2e/instrumentation-dotnet/01-assert.yaml → ...ion/instrumentation-dotnet/01-assert.yaml
diff --git a/...nstrumentation-dotnet/01-install-app.yaml → ...nstrumentation-dotnet/01-install-app.yaml b/...nstrumentation-dotnet/01-install-app.yaml → ...nstrumentation-dotnet/01-install-app.yaml
diff --git a/...trumentation-go/00-install-collector.yaml → ...trumentation-go/00-install-collector.yaml b/...trumentation-go/00-install-collector.yaml → ...trumentation-go/00-install-collector.yaml
diff --git a/...tation-go/00-install-instrumentation.yaml → ...tation-go/00-install-instrumentation.yaml b/...tation-go/00-install-instrumentation.yaml → ...tation-go/00-install-instrumentation.yaml
diff --git a/tests/e2e/instrumentation-go/01-add-scc.yaml → ...tation/instrumentation-go/01-add-scc.yaml b/tests/e2e/instrumentation-go/01-add-scc.yaml → ...tation/instrumentation-go/01-add-scc.yaml
diff --git a/tests/e2e/instrumentation-go/02-assert.yaml → ...ntation/instrumentation-go/02-assert.yaml b/tests/e2e/instrumentation-go/02-assert.yaml → ...ntation/instrumentation-go/02-assert.yaml
diff --git a/...2e/instrumentation-go/02-install-app.yaml → ...on/instrumentation-go/02-install-app.yaml b/...2e/instrumentation-go/02-install-app.yaml → ...on/instrumentation-go/02-install-app.yaml
diff --git a/tests/e2e/instrumentation-go/add-scc.sh → ...rumentation/instrumentation-go/add-scc.sh b/tests/e2e/instrumentation-go/add-scc.sh → ...rumentation/instrumentation-go/add-scc.sh
diff --git a/tests/e2e/instrumentation-go/scc.yaml → ...strumentation/instrumentation-go/scc.yaml b/tests/e2e/instrumentation-go/scc.yaml → ...strumentation/instrumentation-go/scc.yaml
diff --git a/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml b/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml
diff --git a/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml b/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml
diff --git a/...tation-java-multicontainer/01-assert.yaml → ...tation-java-multicontainer/01-assert.yaml b/...tation-java-multicontainer/01-assert.yaml → ...tation-java-multicontainer/01-assert.yaml
diff --git a/...n-java-multicontainer/01-install-app.yaml → ...n-java-multicontainer/01-install-app.yaml b/...n-java-multicontainer/01-install-app.yaml → ...n-java-multicontainer/01-install-app.yaml
diff --git a/...tation-java-multicontainer/02-assert.yaml → ...tation-java-multicontainer/02-assert.yaml b/...tation-java-multicontainer/02-assert.yaml → ...tation-java-multicontainer/02-assert.yaml
diff --git a/...n-java-multicontainer/02-install-app.yaml → ...n-java-multicontainer/02-install-app.yaml b/...n-java-multicontainer/02-install-app.yaml → ...n-java-multicontainer/02-install-app.yaml
diff --git a/...on-java-other-ns/01-cleanup-other-ns.yaml → ...on-java-other-ns/01-cleanup-other-ns.yaml b/...on-java-other-ns/01-cleanup-other-ns.yaml → ...on-java-other-ns/01-cleanup-other-ns.yaml
diff --git a/...n-java-other-ns/02-install-collector.yaml → ...n-java-other-ns/02-install-collector.yaml b/...n-java-other-ns/02-install-collector.yaml → ...n-java-other-ns/02-install-collector.yaml
diff --git a/...-other-ns/02-install-instrumentation.yaml → ...-other-ns/02-install-instrumentation.yaml b/...-other-ns/02-install-instrumentation.yaml → ...-other-ns/02-install-instrumentation.yaml
diff --git a/...trumentation-java-other-ns/03-assert.yaml → ...trumentation-java-other-ns/03-assert.yaml b/...trumentation-java-other-ns/03-assert.yaml → ...trumentation-java-other-ns/03-assert.yaml
diff --git a/...ntation-java-other-ns/03-install-app.yaml → ...ntation-java-other-ns/03-install-app.yaml b/...ntation-java-other-ns/03-install-app.yaml → ...ntation-java-other-ns/03-install-app.yaml
diff --git a/...on-java-other-ns/04-cleanup-other-ns.yaml → ...on-java-other-ns/04-cleanup-other-ns.yaml b/...on-java-other-ns/04-cleanup-other-ns.yaml → ...on-java-other-ns/04-cleanup-other-ns.yaml
diff --git a/...umentation-java/00-install-collector.yaml → ...umentation-java/00-install-collector.yaml b/...umentation-java/00-install-collector.yaml → ...umentation-java/00-install-collector.yaml
diff --git a/...tion-java/00-install-instrumentation.yaml → ...tion-java/00-install-instrumentation.yaml b/...tion-java/00-install-instrumentation.yaml → ...tion-java/00-install-instrumentation.yaml
diff --git a/...s/e2e/instrumentation-java/01-assert.yaml → ...ation/instrumentation-java/01-assert.yaml b/...s/e2e/instrumentation-java/01-assert.yaml → ...ation/instrumentation-java/01-assert.yaml
diff --git a/.../instrumentation-java/01-install-app.yaml → .../instrumentation-java/01-install-app.yaml b/.../instrumentation-java/01-install-app.yaml → .../instrumentation-java/01-install-app.yaml
diff --git a/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml b/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml
diff --git a/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml b/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml
diff --git a/...tion-nodejs-multicontainer/01-assert.yaml → ...tion-nodejs-multicontainer/01-assert.yaml b/...tion-nodejs-multicontainer/01-assert.yaml → ...tion-nodejs-multicontainer/01-assert.yaml
diff --git a/...nodejs-multicontainer/01-install-app.yaml → ...nodejs-multicontainer/01-install-app.yaml b/...nodejs-multicontainer/01-install-app.yaml → ...nodejs-multicontainer/01-install-app.yaml
diff --git a/...tion-nodejs-multicontainer/02-assert.yaml → ...tion-nodejs-multicontainer/02-assert.yaml b/...tion-nodejs-multicontainer/02-assert.yaml → ...tion-nodejs-multicontainer/02-assert.yaml
diff --git a/...nodejs-multicontainer/02-install-app.yaml → ...nodejs-multicontainer/02-install-app.yaml b/...nodejs-multicontainer/02-install-app.yaml → ...nodejs-multicontainer/02-install-app.yaml
diff --git a/...entation-nodejs/00-install-collector.yaml → ...entation-nodejs/00-install-collector.yaml b/...entation-nodejs/00-install-collector.yaml → ...entation-nodejs/00-install-collector.yaml
diff --git a/...on-nodejs/00-install-instrumentation.yaml → ...on-nodejs/00-install-instrumentation.yaml b/...on-nodejs/00-install-instrumentation.yaml → ...on-nodejs/00-install-instrumentation.yaml
diff --git a/...e2e/instrumentation-nodejs/01-assert.yaml → ...ion/instrumentation-nodejs/01-assert.yaml b/...e2e/instrumentation-nodejs/01-assert.yaml → ...ion/instrumentation-nodejs/01-assert.yaml
diff --git a/...nstrumentation-nodejs/01-install-app.yaml → ...nstrumentation-nodejs/01-install-app.yaml b/...nstrumentation-nodejs/01-install-app.yaml → ...nstrumentation-nodejs/01-install-app.yaml
diff --git a/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml b/...-multicontainer/00-install-collector.yaml → ...-multicontainer/00-install-collector.yaml
diff --git a/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml b/...container/00-install-instrumentation.yaml → ...container/00-install-instrumentation.yaml
diff --git a/...tion-python-multicontainer/01-assert.yaml → ...tion-python-multicontainer/01-assert.yaml b/...tion-python-multicontainer/01-assert.yaml → ...tion-python-multicontainer/01-assert.yaml
diff --git a/...python-multicontainer/01-install-app.yaml → ...python-multicontainer/01-install-app.yaml b/...python-multicontainer/01-install-app.yaml → ...python-multicontainer/01-install-app.yaml
diff --git a/...tion-python-multicontainer/02-assert.yaml → ...tion-python-multicontainer/02-assert.yaml b/...tion-python-multicontainer/02-assert.yaml → ...tion-python-multicontainer/02-assert.yaml
diff --git a/...python-multicontainer/02-install-app.yaml → ...python-multicontainer/02-install-app.yaml b/...python-multicontainer/02-install-app.yaml → ...python-multicontainer/02-install-app.yaml
diff --git a/...entation-python/00-install-collector.yaml → ...entation-python/00-install-collector.yaml b/...entation-python/00-install-collector.yaml → ...entation-python/00-install-collector.yaml
diff --git a/...on-python/00-install-instrumentation.yaml → ...on-python/00-install-instrumentation.yaml b/...on-python/00-install-instrumentation.yaml → ...on-python/00-install-instrumentation.yaml
diff --git a/...e2e/instrumentation-python/01-assert.yaml → ...ion/instrumentation-python/01-assert.yaml b/...e2e/instrumentation-python/01-assert.yaml → ...ion/instrumentation-python/01-assert.yaml
diff --git a/...nstrumentation-python/01-install-app.yaml → ...nstrumentation-python/01-install-app.yaml b/...nstrumentation-python/01-install-app.yaml → ...nstrumentation-python/01-install-app.yaml
diff --git a/...rumentation-sdk/00-install-collector.yaml → ...rumentation-sdk/00-install-collector.yaml b/...rumentation-sdk/00-install-collector.yaml → ...rumentation-sdk/00-install-collector.yaml
diff --git a/...ation-sdk/00-install-instrumentation.yaml → ...ation-sdk/00-install-instrumentation.yaml b/...ation-sdk/00-install-instrumentation.yaml → ...ation-sdk/00-install-instrumentation.yaml
diff --git a/tests/e2e/instrumentation-sdk/01-assert.yaml → ...tation/instrumentation-sdk/01-assert.yaml b/tests/e2e/instrumentation-sdk/01-assert.yaml → ...tation/instrumentation-sdk/01-assert.yaml
diff --git a/...e/instrumentation-sdk/01-install-app.yaml → ...n/instrumentation-sdk/01-install-app.yaml b/...e/instrumentation-sdk/01-install-app.yaml → ...n/instrumentation-sdk/01-install-app.yaml