tests: sort env vars before asserting them to make run deterministic (#…

…1543)
odigos-io · Sep 25, 2024 · 78ee95e · 78ee95e
1 parent f1692bd
commit 78ee95e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -226,3 +226,8 @@ dev-tests-kind-cluster:
 .PHONY: dev-tests-setup
 dev-tests-setup: TAG := e2e-test
 dev-tests-setup: dev-tests-kind-cluster cli-build build-images load-to-kind
+
+# Use this target to avoid rebuilding the images if all that changed is the e2e test code
+.PHONY: dev-tests-setup-no-build
+dev-tests-setup-no-build: TAG := e2e-test
+dev-tests-setup-no-build: dev-tests-kind-cluster load-to-kind
diff --git a/tests/e2e/helm-chart/assert-post-dest-runtime-details.yaml b/tests/e2e/helm-chart/assert-post-dest-runtime-details.yaml
@@ -35,7 +35,7 @@ status:
   observedWorkloadGeneration: 2 # pod has been restarted after destination was added
   runtimeDetailsByContainer:
     - containerName: frontend
-      envVars:
+      (sort_by(envVars, &name)):
       - name: JAVA_OPTS
         value: -javaagent:/var/odigos/java/javaagent.jar
       - name: JAVA_TOOL_OPTIONS

diff --git a/tests/e2e/multi-apps/assert-post-dest-runtime-details.yaml b/tests/e2e/multi-apps/assert-post-dest-runtime-details.yaml
@@ -35,7 +35,7 @@ status:
   observedWorkloadGeneration: 2 # pod has been restarted after destination was added
   runtimeDetailsByContainer:
     - containerName: frontend
-      envVars:
+      (sort_by(envVars, &name)):
       - name: JAVA_OPTS
         value: -javaagent:/var/odigos/java/javaagent.jar
       - name: JAVA_TOOL_OPTIONS