Skip to content

Commit b0332f2

Browse files
authored
Move the instrumentation E2E tests to their own folder (open-telemetry#2084)
Signed-off-by: Israel Blancas <[email protected]>
1 parent 454487b commit b0332f2

File tree

70 files changed

+16
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+16
-0
lines changed

.github/workflows/e2e.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- "1.28"
3030
group:
3131
- e2e
32+
- e2e-instrumentation
3233
- e2e-upgrade
3334
- e2e-prometheuscr
3435
- e2e-autoscale

Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ generate: controller-gen api-docs
176176
e2e:
177177
$(KUTTL) test
178178

179+
180+
# instrumentation end-to-tests
181+
.PHONY: e2e-instrumentation
182+
e2e-instrumentation:
183+
$(KUTTL) test --config kuttl-test-instrumentation.yaml
184+
179185
# end-to-end-test for PrometheusCR E2E tests
180186
.PHONY: e2e-prometheuscr
181187
e2e-prometheuscr:

kuttl-test-instrumentation.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestSuite
3+
testDirs:
4+
- ./tests/e2e-instrumentation/
5+
timeout: 300

tests/e2e/instrumentation-apache-httpd/01-install-app.yaml tests/e2e-instrumentation/instrumentation-apache-httpd/01-install-app.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ spec:
1515
sidecar.opentelemetry.io/inject: "true"
1616
instrumentation.opentelemetry.io/inject-apache-httpd: "true"
1717
spec:
18+
securityContext:
19+
runAsUser: 1000
20+
runAsGroup: 3000
21+
fsGroup: 2000
1822
containers:
1923
- name: myapp
2024
image: docker.io/chrlic/apache-test@sha256:fad58c6ce7a4f477b455bece2a1980741fa6f81cef1e1093a3b72f9b2ffa7b8e

0 commit comments

Comments
 (0)