diff options
author | Mek Stittri <mstittri@gitlab.com> | 2019-03-15 15:46:39 +0000 |
---|---|---|
committer | Mek Stittri <mstittri@gitlab.com> | 2019-03-15 15:46:39 +0000 |
commit | 297ce3e58611a0455f2666caa5a0989f2ec4e03a (patch) | |
tree | 9992da3e8dabaf2a21cd25c4b4ba8265a546ce12 /doc/development/testing_guide | |
parent | 480303b5c1b147fb99278d281165aa04e920230a (diff) | |
parent | d19c60be2ac8f321c65b4bc5e1f1976a69ce5e5c (diff) | |
download | gitlab-ce-297ce3e58611a0455f2666caa5a0989f2ec4e03a.tar.gz |
Merge branch 'docs-improve-package-and-qa-documentation' into 'master'
Document better the package-and-qa job
See merge request gitlab-org/gitlab-ce!25978
Diffstat (limited to 'doc/development/testing_guide')
-rw-r--r-- | doc/development/testing_guide/end_to_end_tests.md | 25 | ||||
-rw-r--r-- | doc/development/testing_guide/img/qa_on_merge_requests_cicd_architecture.png | bin | 0 -> 64862 bytes |
2 files changed, 25 insertions, 0 deletions
diff --git a/doc/development/testing_guide/end_to_end_tests.md b/doc/development/testing_guide/end_to_end_tests.md index daa0714aec3..7010250b33c 100644 --- a/doc/development/testing_guide/end_to_end_tests.md +++ b/doc/development/testing_guide/end_to_end_tests.md @@ -17,11 +17,13 @@ a black-box testing framework for the API and the UI. We run scheduled pipeline each night to test nightly builds created by Omnibus. You can find these nightly pipelines at [gitlab-org/quality/nightly/pipelines][quality-nightly-pipelines]. +Results are reported in the `#qa-nightly` Slack channel. ### Testing staging We run scheduled pipeline each night to test staging. You can find these nightly pipelines at [gitlab-org/quality/staging/pipelines][quality-staging-pipelines]. +Results are reported in the `#qa-staging` Slack channel. ### Testing code in merge requests @@ -40,6 +42,29 @@ Below you can read more about how to use it and how does it work. Currently, we are using _multi-project pipeline_-like approach to run QA pipelines. +![QA on merge requests CI/CD architecture](img/qa_on_merge_requests_cicd_architecture.png) + +<details> +<summary>Show mermaid source</summary> +<pre> +graph LR + A1 -.->|1. Triggers an omnibus-gitlab pipeline and wait for it to be done| A2 + B2[<b>`Trigger-qa` stage</b><br />`Trigger:qa-test` job] -.->|2. Triggers a gitlab-qa pipeline and wait for it to be done| A3 + +subgraph gitlab-ce/ee pipeline + A1[<b>`test` stage</b><br />`package-and-qa` job] + end + +subgraph omnibus-gitlab pipeline + A2[<b>`Trigger-docker` stage</b></b><br />`Trigger:gitlab-docker` job] -->|once done| B2 + end + +subgraph gitlab-qa pipeline + A3>QA jobs run] -.->|3. Reports back the pipeline result to the `package-and-qa` job<br />and post the result on the original commit tested| A1 + end +</pre> +</details> + 1. Developer triggers a manual action, that can be found in CE / EE merge requests. This starts a chain of pipelines in multiple projects. diff --git a/doc/development/testing_guide/img/qa_on_merge_requests_cicd_architecture.png b/doc/development/testing_guide/img/qa_on_merge_requests_cicd_architecture.png Binary files differnew file mode 100644 index 00000000000..5b93a05db96 --- /dev/null +++ b/doc/development/testing_guide/img/qa_on_merge_requests_cicd_architecture.png |