Conditional waiting for edge job

innovatrics · Jan 25, 2024 · 135f388 · 135f388
1 parent 9e6c923
commit 135f388
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -38,6 +38,9 @@ jobs:
         variant-values: ['ci/multitenant-values.yaml', 'ci/edge-values.yaml']
     steps:
       - uses: actions/checkout@v3
+      - name: Install yq
+        run: |
+          sudo snap install yq
       - name: Setup helm CLI
         uses: azure/setup-helm@v3
         with:
@@ -72,7 +75,9 @@ jobs:
         run: |
           helm install smartface . -f ci/test-values.yaml --set tests.authentication.tenant1.clientSecret="$TENANT_1_SECRET" --set tests.authentication.tenant2.clientSecret="$TENANT_2_SECRET" -f ${{ matrix.variant-values }}
           kubectl rollout status deployment sf-api --timeout=300s
-          kubectl wait --for=condition=complete job/sf-wl-update-log-population --timeout=300s
+          if helm get values smartface -a | yq -e '.edgeStreamsStateSync.wlStreamPopulationJob.enabled'; then
+            kubectl wait --for=condition=complete job/sf-wl-update-log-population --timeout=300s
+          fi
       - name: Test helm chart
         run: |
           helm test smartface

diff --git a/ci/edge-values.yaml b/ci/edge-values.yaml
@@ -1,3 +1,9 @@
 features:
   edgeStreams:
     enabled: true
+
+# edge stream tests test WL sync, which requires the population job to be run
+edgeStreamsStateSync:
+  resources: null
+  wlStreamPopulationJob:
+    enabled: true
diff --git a/ci/test-values.yaml b/ci/test-values.yaml
@@ -41,11 +41,6 @@ liveness:
   resources: null
 edgeStreamProcessor:
   resources: null
-# edge stream tests test WL sync, which requires the population job to be run
-edgeStreamsStateSync:
-  resources: null
-  wlStreamPopulationJob:
-    enabled: true
 base:
   resources: null
 faceMatcher: