summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-24 21:09:16 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-24 21:09:16 +0000
commit5f23ef4ecaf902912d57c577429086b6e991b6eb (patch)
tree11c0a883afaab1248173cb9184445e0e408953c5 /doc/ci
parent2948e306c053bb99b6f39a12fb2eebfdf228d89a (diff)
downloadgitlab-ce-5f23ef4ecaf902912d57c577429086b6e991b6eb.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/junit_test_reports.md3
-rw-r--r--doc/ci/variables/README.md10
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/ci/junit_test_reports.md b/doc/ci/junit_test_reports.md
index aedda3c8341..854d988cad4 100644
--- a/doc/ci/junit_test_reports.md
+++ b/doc/ci/junit_test_reports.md
@@ -140,6 +140,9 @@ java:
junit: build/test-results/test/**/TEST-*.xml
```
+NOTE: **Note:**
+Support for `**` was added in [GitLab Runner 13.0](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/2620).
+
#### Maven
For parsing [Surefire](https://maven.apache.org/surefire/maven-surefire-plugin/)
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 3a238d93ea4..0249030da09 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -444,11 +444,11 @@ To add an instance-level variable:
1. Navigate to your admin area's **Settings > CI/CD** and expand the **Variables** section.
1. Click the **Add variable** button, and fill in the details:
- - **Key**: Must be one line, using only letters, numbers, or `_` (underscore), with no spaces.
- - **Value**: 700 characters allowed.
- - **Type**: `File` or `Variable`.
- - **Protect variable** (Optional): If selected, the variable will only be available in pipelines that run on protected branches or tags.
- - **Mask variable** (Optional): If selected, the variable's **Value** will not be shown in job logs. The variable will not be saved if the value does not meet the [masking requirements](#masked-variable-requirements).
+ - **Key**: Must be one line, using only letters, numbers, or `_` (underscore), with no spaces.
+ - **Value**: [Since GitLab 13.3](https://gitlab.com/gitlab-org/gitlab/-/issues/220028), 10,000 characters allowed. This is also bounded by the limits of the selected Runner operating system. In GitLab 13.0 to 13.2, 700 characters allowed.
+ - **Type**: `File` or `Variable`.
+ - **Protect variable** (Optional): If selected, the variable will only be available in pipelines that run on protected branches or tags.
+ - **Mask variable** (Optional): If selected, the variable's **Value** will not be shown in job logs. The variable will not be saved if the value does not meet the [masking requirements](#masked-variable-requirements).
After a variable is created, you can update any of the details by clicking the **{pencil}** **Edit** button.