Commit f0aa0034 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'set-default-pipeline-timeout' into 'master'

Set default job timeout to 90m and dast to 4h

See merge request gitlab-org/gitlab!36983
parents b7510d7a 21d1a9c1
...@@ -20,6 +20,8 @@ default: ...@@ -20,6 +20,8 @@ default:
- gitlab-org - gitlab-org
# All jobs are interruptible by default # All jobs are interruptible by default
interruptible: true interruptible: true
# Default job timeout set to 90m https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/10520
timeout: 90m
workflow: workflow:
rules: rules:
......
...@@ -172,6 +172,7 @@ dependency_scanning: ...@@ -172,6 +172,7 @@ dependency_scanning:
# # - 'export DAST_AUTH_URL="${DAST_WEBSITE}/users/sign_in"' # # - 'export DAST_AUTH_URL="${DAST_WEBSITE}/users/sign_in"'
# # - 'export DAST_PASSWORD="${REVIEW_APPS_ROOT_PASSWORD}"' # # - 'export DAST_PASSWORD="${REVIEW_APPS_ROOT_PASSWORD}"'
# - /analyze -t $DAST_WEBSITE # - /analyze -t $DAST_WEBSITE
# timeout: 4h
# artifacts: # artifacts:
# paths: # paths:
# - gl-dast-report.json # GitLab-specific # - gl-dast-report.json # GitLab-specific
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment