diff --git a/.github/actions/deploy-local-acs/action.yml b/.github/actions/deploy-local-acs/action.yml index 3eb14091b..2e2843e7b 100644 --- a/.github/actions/deploy-local-acs/action.yml +++ b/.github/actions/deploy-local-acs/action.yml @@ -24,6 +24,13 @@ inputs: chart's standard values.yaml instead. required: false default: 'latest' + helm_install_timeout: + description: >- + Timeout for the Helm install to wait for the chart's hooks (e.g. the + search reindexing job) and, via --wait, its Deployments, StatefulSets + and PVCs to become ready, in Helm's duration format (e.g. '5m', '10m'). + required: false + default: '10m' runs: using: "composite" @@ -170,6 +177,7 @@ runs: shell: bash env: ACS_VERSION_INPUT: ${{ inputs.acs_deployment_version }} + HELM_INSTALL_TIMEOUT: ${{ inputs.helm_install_timeout }} run: | [ "$ACS_VERSION_INPUT" = "master" ] && chart_values="pre-release_values.yaml" || chart_values="values.yaml" for attempt in 1 2 3; do @@ -185,14 +193,13 @@ runs: sleep "$sleep_s" done helm install acs acs-deployment/helm/alfresco-content-services \ + --wait \ + --timeout "$HELM_INSTALL_TIMEOUT" \ --set global.search.sharedSecret="$(openssl rand -hex 24)" \ --values "acs-deployment/helm/alfresco-content-services/${chart_values}" \ --values acs-deployment/test/enterprise-integration-test-values.yaml \ --values .github/acs-deployment-values-override.yaml - - name: Wait for pods to be ready - uses: Alfresco/alfresco-build-tools/.github/actions/kubectl-wait@v18.21.0 - - name: Report deployed ACS versions if: always() shell: bash