Expand timeouts to runtime detection (#1690)

Co-authored-by: Tamir David <tamirdavid@Tamirs-MacBook-Pro.local>
odigos-io · Nov 5, 2024 · 44c88d8 · 44c88d8
1 parent 16013b1
commit 44c88d8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/.github/workflows/cross-cloud-tests.yaml b/.github/workflows/cross-cloud-tests.yaml
@@ -205,7 +205,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: run-details
+          name: run-details-${{ matrix.cloud-provider }}-${{ matrix.test-scenario }}
           path: odigos_debug*.tar.gz
         continue-on-error: true
 

diff --git a/tests/e2e/helm-chart/chainsaw-test.yaml b/tests/e2e/helm-chart/chainsaw-test.yaml
@@ -95,20 +95,43 @@ spec:
     - assert:
         file: assert-apps-installed.yaml
 
-  - name: Detect Languages
+  - name: Instrument Namespace
     try:
     - apply:
         file: 03-instrument-ns.yaml
+
+  - name: Assert Runtime Detected
+    try:
     - assert:
+        timeout: 2m
         file: assert-runtime-detected.yaml
+
   - name: Add Destination
     try:
     - apply:
         file: 04-add-destination.yaml
+
+  - name: Assert Instrumented and Pipeline
+    try:
     - assert:
         file: assert-instrumented-and-pipeline.yaml
+
+  - name: Verify InstrumentationConfig Generation Status
+    try:
+    - script:
+        timeout: 65s
+        content: |
+          kubectl wait --for=jsonpath='{.status.observedWorkloadGeneration}'=2 -n default instrumentationconfig/deployment-frontend --timeout=60s
+          kubectl wait --for=jsonpath='{.status.observedWorkloadGeneration}'=2 -n default instrumentationconfig/deployment-coupon --timeout=60s
+          kubectl wait --for=jsonpath='{.status.observedWorkloadGeneration}'=2 -n default instrumentationconfig/deployment-inventory --timeout=60s
+          kubectl wait --for=jsonpath='{.status.observedWorkloadGeneration}'=2 -n default instrumentationconfig/deployment-pricing --timeout=60s
+          kubectl wait --for=jsonpath='{.status.observedWorkloadGeneration}'=2 -n default instrumentationconfig/deployment-membership --timeout=60s
+
+  - name: Assert Post Destination Runtime Details
+    try:
     - assert:
         file: assert-post-dest-runtime-details.yaml
+
   - name: Generate Traffic
     try:
       - script:

diff --git a/tests/e2e/multi-apps/chainsaw-test.yaml b/tests/e2e/multi-apps/chainsaw-test.yaml
@@ -68,21 +68,33 @@ spec:
           kubectl wait --for=condition=ready pod -l app=membership --timeout=60s        
     - assert:
         file: assert-apps-installed.yaml
-        
-  - name: Detect Languages
+
+  - name: Instrument Namespace
     try:
     - apply:
         file: 03-instrument-ns.yaml
+
+  - name: Assert Runtime Detected
+    try:
     - assert:
+        timeout: 2m
         file: assert-runtime-detected.yaml
+
   - name: Add Destination
     try:
     - apply:
         file: 04-add-destination.yaml
+
+  - name: Assert Instrumented and Pipeline
+    try:
     - assert:
         file: assert-instrumented-and-pipeline.yaml
+
+  - name: Assert Post Destination Runtime Details
+    try:        
     - assert:
         file: assert-post-dest-runtime-details.yaml
+
   - name: Generate Traffic
     try:
     - script: