diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /.gitlab/ci/qa.gitlab-ci.yml | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 9a81ea513b7..96a8f093fea 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -59,6 +59,10 @@ package-and-qa: extends: - .package-and-qa-base - .qa:rules:package-and-qa + # This job often times out, so temporarily use private runners and a long timeout: https://gitlab.com/gitlab-org/gitlab/-/issues/238563 + tags: + - prm + timeout: 4h needs: - job: build-qa-image artifacts: false |