diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4ca63d9822..f29b7ca236 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -414,7 +414,7 @@ jobs: deploy_to_azure: runs-on: ubuntu-20.04 name: Deploy demo app to Microsoft Azure - if: github.repository == 'Taskana/taskana' && github.ref == 'refs/heads/master' && github.head_ref == '' + if: github.repository == 'Taskana/taskana' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/deploy-demo-fix') && github.head_ref == '' needs: [ test_frontend, test_e2e, test_backend ] steps: - name: Git checkout @@ -462,7 +462,7 @@ jobs: - name: Wait for Azure for 60 seconds uses: jakejarvis/wait-action@master with: - time: '60s' + time: '100s' - name: Smoke test documentation run: ci/verify_docs_alive.sh - name: Cancel workflow diff --git a/ci/verify_docs_alive.sh b/ci/verify_docs_alive.sh index c70d215e89..1685ebb047 100755 --- a/ci/verify_docs_alive.sh +++ b/ci/verify_docs_alive.sh @@ -1,14 +1,16 @@ #!/bin/bash set -e # fail fast set -x + BASE_URL=https://taskana.azurewebsites.net/taskana +TIMEOUT=30 # seconds -test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/rest/rest-api.html")" -test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/rest/simplehistory-rest-api.html")" -test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/rest/routing-rest-api.html")" +test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null --connect-timeout $TIMEOUT --max-time $TIMEOUT "$BASE_URL/docs/rest/rest-api.html")" +test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null --connect-timeout $TIMEOUT --max-time $TIMEOUT "$BASE_URL/docs/rest/simplehistory-rest-api.html")" +test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null --connect-timeout $TIMEOUT --max-time $TIMEOUT "$BASE_URL/docs/rest/routing-rest-api.html")" for module in taskana-core taskana-spring; do - test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/java/$module/index.html")" + test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null --connect-timeout $TIMEOUT --max-time $TIMEOUT "$BASE_URL/docs/java/$module/index.html")" done for module in taskana-cdi; do - test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null "$BASE_URL/docs/java/$module/pro/taskana/common/internal/package-summary.html")" + test 200 -eq "$(curl -sw "%{http_code}" -o /dev/null --connect-timeout $TIMEOUT --max-time $TIMEOUT "$BASE_URL/docs/java/$module/pro/taskana/common/internal/package-summary.html")" done