start waiting right before test

Alfresco · Mar 15, 2024 · 2fc796d · 2fc796d
1 parent 4dd4ae8
commit 2fc796d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
@@ -121,8 +121,6 @@ jobs:
           fi
 
       - name: Helm install
-        env:
-          VALUES_FILE: ${{ matrix.values }}
         run: |
           helm dep up ./helm/alfresco-content-services &&
           helm install acs ./helm/alfresco-content-services \
@@ -136,9 +134,6 @@ 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()
@@ -149,12 +144,17 @@ jobs:
 
       - name: Run Newman tests
         uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v.3.0.0
+        env:
+          VALUES_FILE: ${{ matrix.values }}
         id: newman
         with:
-          timeout_minutes: 1
+          timeout_minutes: 5
           retry_wait_seconds: 20
           max_attempts: 5
           command: >-
+            if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo "Waiting for ESC Reindexing job to complete";
+              kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing;
+            fi;
             docker run --network=host
             -v $(pwd)/test/postman:/etc/postman
             -t postman/newman run /etc/postman/helm/acs-test-helm-collection.json

diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml
@@ -31,7 +31,7 @@ share:
 alfresco-search:
   resources:
     requests:
-      cpu: "0.01"
+      cpu: "0.25"
       memory: "512Mi"
     limits:
       cpu: "2"
@@ -48,7 +48,7 @@ elasticsearch:
 alfresco-search-enterprise:
   resources:
     requests:
-      cpu: "0.01"
+      cpu: "0.1"
       memory: "128Mi"
     limits:
       cpu: "1"
@@ -153,7 +153,7 @@ alfresco-sync-service:
 activemq:
   resources:
     requests:
-      cpu: "0.01"
+      cpu: "0.1"
       memory: "512Mi"
 alfresco-digital-workspace:
   resources: