summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-12-18 22:37:17 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-12-18 22:37:17 +0000
commit8dd02443e90d5af5d6ea557f8c18aea16573518c (patch)
tree4424a79999255a252b68ac18782ddbafbabf4eb3
parent546fa165ff728bc2d25ed9b55b95dd1d48139d4a (diff)
parentf9f41716efb10e4e2694b34b8adf7ae09025041e (diff)
downloadgitlab-ce-8dd02443e90d5af5d6ea557f8c18aea16573518c.tar.gz
Merge branch 'feature/runner-script-attempts-docs' into 'master'
Add new runner script attempts docs and update .gitlab-ci.yml Related: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1907 and https://gitlab.com/gitlab-com/infrastructure/issues/685 Adds missing docs about the new script attempts variables in the runner. See merge request !8100
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--doc/ci/variables/README.md3
-rw-r--r--doc/ci/yaml/README.md25
3 files changed, 29 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e522d47d19d..b256e8a2a5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ variables:
USE_BUNDLE_INSTALL: "true"
GIT_DEPTH: "20"
PHANTOMJS_VERSION: "2.1.1"
+ GET_SOURCES_ATTEMPTS: "3"
before_script:
- source ./scripts/prepare_build.sh
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index baa5fc67816..d3b9611b02e 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -61,6 +61,9 @@ version of Runner required.
| **CI_RUNNER_DESCRIPTION** | 8.10 | 0.5 | The description of the runner as saved in GitLab |
| **CI_RUNNER_TAGS** | 8.10 | 0.5 | The defined runner tags |
| **CI_DEBUG_TRACE** | all | 1.7 | Whether [debug tracing](#debug-tracing) is enabled |
+| **GET_SOURCES_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to fetch sources running a build |
+| **ARTIFACT_DOWNLOAD_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to download artifacts running a build |
+| **RESTORE_CACHE_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to restore the cache running a build |
| **GITLAB_USER_ID** | 8.12 | all | The id of the user who started the build |
| **GITLAB_USER_EMAIL** | 8.12 | all | The email of the user who started the build |
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index a62193700fc..dd8e1078c60 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1034,6 +1034,31 @@ variables:
GIT_STRATEGY: none
```
+## Build stages attempts
+
+> Introduced in GitLab, it requires GitLab Runner v1.9+.
+
+You can set the number for attempts the running build will try to execute each
+of the following stages:
+
+| Variable | Description |
+|-------------------------|-------------|
+| **GET_SOURCES_ATTEMPTS** | Number of attempts to fetch sources running a build |
+| **ARTIFACT_DOWNLOAD_ATTEMPTS** | Number of attempts to download artifacts running a build |
+| **RESTORE_CACHE_ATTEMPTS** | Number of attempts to restore the cache running a build |
+
+The default is one single attempt.
+
+Example:
+
+```
+variables:
+ GET_SOURCES_ATTEMPTS: "3"
+```
+
+You can set the them in the global [`variables`](#variables) section or the [`variables`](#job-variables)
+section for individual jobs.
+
## Shallow cloning
> Introduced in GitLab 8.9 as an experimental feature. May change in future