summaryrefslogtreecommitdiff
path: root/doc/development/testing_guide/end_to_end
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-06-20 21:37:44 +0000
committerMark Lapierre <mlapierre@gitlab.com>2019-06-20 21:37:44 +0000
commit61a2ed5d0ec945e17f10b01c3eb1fc9e22c87bb1 (patch)
treea8257ddea22f95fd9830c6598d834a24f07be9a6 /doc/development/testing_guide/end_to_end
parentea795837fdaf23c4da423e0c71268e31687d7849 (diff)
parent09d7f0c0e0c6c7906078dbf1797b08e08d0e696c (diff)
downloadgitlab-ce-61a2ed5d0ec945e17f10b01c3eb1fc9e22c87bb1.tar.gz
Merge branch 'docs-ml-gdk-how-to-more-info' into 'master'
Update docs on how to run E2E tests See merge request gitlab-org/gitlab-ce!29823
Diffstat (limited to 'doc/development/testing_guide/end_to_end')
-rw-r--r--doc/development/testing_guide/end_to_end/index.md12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md
index afd81ff00b2..527cd350633 100644
--- a/doc/development/testing_guide/end_to_end/index.md
+++ b/doc/development/testing_guide/end_to_end/index.md
@@ -126,6 +126,18 @@ See [Review Apps][review-apps] for more details about Review Apps.
[helm-chart]: https://gitlab.com/charts/gitlab/
[cng]: https://gitlab.com/gitlab-org/build/CNG
+## How do I run the tests?
+
+There are two main options for running the tests. If you simply want to run the
+existing tests against a live GitLab instance or against a pre-built docker image
+you can use the [GitLab QA orchestrator][gitlab-qa-readme]. See also [examples
+of the test scenarios you can run via the orchestrator](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md#examples).
+
+On the other hand, if you would like to run against a local development GitLab
+environment, you can use the [GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit/).
+Please refer to the instructions in the [QA README](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/qa/README.md#how-can-i-use-it)
+and the section below.
+
## How do I write tests?
In order to write new tests, you first need to learn more about GitLab QA