summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeandro Camargo <leandroico@gmail.com>2016-11-26 01:02:08 -0200
committerLeandro Camargo <leandroico@gmail.com>2017-01-25 01:07:44 -0200
commitf1e920ed86133bfea0abfc66ca44282813822073 (patch)
treefe6f35c9af1aa1d3d96e6f405692717299b80cc0 /doc
parentbb12ee051f95ee747c0e2b98a85675de53dca8ea (diff)
downloadgitlab-ce-f1e920ed86133bfea0abfc66ca44282813822073.tar.gz
Simplify coverage setting and comply to some requests in code review
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md30
1 files changed, 7 insertions, 23 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index a8c0721bbcc..0a264c0e228 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -286,24 +286,11 @@ build outputs. Setting this up globally will make all the jobs to use this
setting for output filtering and extracting the coverage information from your
builds.
-#### coverage:output_filter
-
-For now, there is only the `output_filter` directive expected to be inside the
-`coverage` entry. And it is expected to be a regular expression.
-
-So, in the end, you're going to have something like the following:
+Regular expressions are used by default. So using surrounding `/` is optional, given it'll always be read as a regular expression. Don't forget to escape special characters whenever you want to match them in the regular expression.
+A simple example:
```yaml
-coverage:
- output_filter: /\(\d+\.\d+\) covered\./
-```
-
-It's worth to keep in mind that the surrounding `/` is optional. So, the above
-example is the same as the following:
-
-```yaml
-coverage:
- output_filter: \(\d+\.\d+\) covered\.
+coverage: \(\d+\.\d+\) covered\.
```
## Jobs
@@ -347,7 +334,6 @@ job_name:
| before_script | no | Override a set of commands that are executed before build |
| after_script | no | Override a set of commands that are executed after build |
| environment | no | Defines a name of environment to which deployment is done by this build |
-| environment | no | Defines a name of environment to which deployment is done by this build |
| coverage | no | Define coverage settings for a given job |
### script
@@ -1032,17 +1018,15 @@ been defined in the global level. A quick example of one overwritting the
other would be:
```yaml
-coverage:
- output_filter: /\(\d+\.\d+\) covered\./
+coverage: \(\d+\.\d+\) covered\.
job1:
- coverage:
- output_filter: /Code coverage: \d+\.\d+/
+ coverage: Code coverage: \d+\.\d+
```
In the example above, considering the context of the job `job1`, the coverage
-regex that would be used is `/Code coverage: \d+\.\d+/` instead of
-`/\(\d+\.\d+\) covered\./`.
+regex that would be used is `Code coverage: \d+\.\d+` instead of
+`\(\d+\.\d+\) covered\.`.
## Git Strategy