From 69f8f9d42fec05e00e0330387334f801cb8c1bf5 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Fri, 15 Mar 2024 16:46:32 +0100
Subject: [PATCH] wait for reindex job before starting tests

---
 .github/workflows/helm-enterprise.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
index c8bf3b356..8db5d5c73 100644
--- a/.github/workflows/helm-enterprise.yml
+++ b/.github/workflows/helm-enterprise.yml
@@ -111,16 +111,14 @@ jobs:
       - name: Check if we want additional helm customizations
         id: configurable-extra-values
         run: |
-          if [ "${{ matrix.values }}" = "values.yaml" ]; then
-            echo "Enabling clustered tests"
-            echo "helm_install_params=--set alfresco-repository.replicaCount=2 --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT"
-          fi
           if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then
             echo "Skipping renditions tests on ACS 7.0.N"
             echo "helm_install_params=--set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Helm install
+        env:
+          VALUES_FILE: ${{ matrix.values }}
         run: |
           helm dep up ./helm/alfresco-content-services &&
           helm install acs ./helm/alfresco-content-services \
@@ -134,6 +132,9 @@ jobs:
           kubectl get pods --watch-only &
           KWPID=$!
           kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID
+          if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo "Waiting for ESC Reindexing job to complete"
+            kubectl wait --timeout=4m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing
+          fi
 
       - name: Spit cluster status after install
         if: always()