summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-03-25 06:34:22 +0000
committerEvan Read <eread@gitlab.com>2019-03-25 06:34:22 +0000
commit66115fee28faece4290b0649c3284fd14384a4b2 (patch)
treebccffbe56b6dcea18df726958201ca8cb98e0984 /doc
parent9dd5cb9bcddd825a64867e74eef302f03409e063 (diff)
parenteef3cc4201058a4f195300ba0df9797550cc4068 (diff)
downloadgitlab-ce-66115fee28faece4290b0649c3284fd14384a4b2.tar.gz
Merge branch 'docs-junit-report-paths-matching' into 'master'
Correct JUnit report path pattern matching description See merge request gitlab-org/gitlab-ce!26215
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/junit_test_reports.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/junit_test_reports.md b/doc/ci/junit_test_reports.md
index cf18c6d9660..d03c0b68daf 100644
--- a/doc/ci/junit_test_reports.md
+++ b/doc/ci/junit_test_reports.md
@@ -113,8 +113,8 @@ There are a few tools that can produce JUnit reports in Java.
In the following example, `gradle` is used to generate the test reports.
If there are multiple test tasks defined, `gradle` will generate multiple
-directories under `build/test-results/`. In that case, you can leverage regex
-matching by defining the following path: `build/test-results/test/TEST-*.xml`:
+directories under `build/test-results/`. In that case, you can leverage glob
+matching by defining the following path: `build/test-results/test/**/TEST-*.xml`:
```yaml
java:
@@ -123,7 +123,7 @@ java:
- gradle test
artifacts:
reports:
- junit: build/test-results/test/TEST-*.xml
+ junit: build/test-results/test/**/TEST-*.xml
```
#### Maven