inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extend waiting script to work with mtls tests (#2321)

Browse Source
This commit is contained in:
Marcin Strankowski
2023-11-17 10:59:28 +01:00
committed by GitHub
parent 75a3e03dfa
commit d6bf9a5748
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packaging/tests/scripts/wait-for-alfresco-start.sh
View File

@@ -9,13 +9,27 @@ then
exit 1 exit 1
fi fi
# If MTLS enabled configure keystore/truststore for curl command
if [[ $ALFRESCO_URL == https* ]]; then
KEYSTORE_TRUSTSTORE_PATH="${CI_WORKSPACE}/keystores/testClient"
KEYSTORE_PASSWORD="password"
ADDITIONAL_MTLS_CONFIG="--key $KEYSTORE_TRUSTSTORE_PATH/client-key.pem --cert $KEYSTORE_TRUSTSTORE_PATH/client-cert.pem:$KEYSTORE_PASSWORD --cacert $KEYSTORE_TRUSTSTORE_PATH/testClient_truststore.pem"
if [[ ${HOSTNAME_VERIFICATION_DISABLED} == true ]]; then
ADDITIONAL_MTLS_CONFIG=$ADDITIONAL_MTLS_CONFIG" -k"
fi
else
ADDITIONAL_MTLS_CONFIG=""
fi
WAIT_INTERVAL=1 WAIT_INTERVAL=1
COUNTER=0 COUNTER=0
TIMEOUT=300 TIMEOUT=300
t0=$(date +%s) t0=$(date +%s)
echo "Waiting for alfresco to start" echo "Waiting for alfresco to start"
until $(curl --output /dev/null --silent --head --fail ${ALFRESCO_URL}) || [ "$COUNTER" -eq "$TIMEOUT" ]; do echo curl --output /dev/null --silent --head --fail ${ADDITIONAL_MTLS_CONFIG} ${ALFRESCO_URL}
until $(curl --output /dev/null --silent --head --fail ${ADDITIONAL_MTLS_CONFIG} ${ALFRESCO_URL}) || [ "$COUNTER" -eq "$TIMEOUT" ]; do
printf '.' printf '.'
sleep $WAIT_INTERVAL sleep $WAIT_INTERVAL
COUNTER=$(($COUNTER+$WAIT_INTERVAL)) COUNTER=$(($COUNTER+$WAIT_INTERVAL))