diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-27 12:14:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-27 12:14:40 +0300 |
| commit | 43511919ac44a093aa93df46fba8f308ae8ddaac (patch) | |
| tree | 158247fc04a842df963cde07d51058a8283a17ad /doc/development/testing_guide | |
| parent | 62b1efcc13b511943d1e0b96f13ce435571997ac (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/testing_guide')
| -rw-r--r-- | doc/development/testing_guide/end_to_end/index.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md index 1fc9bc8258a..54287fc0993 100644 --- a/doc/development/testing_guide/end_to_end/index.md +++ b/doc/development/testing_guide/end_to_end/index.md @@ -108,12 +108,12 @@ This problem was discovered in <https://gitlab.com/gitlab-org/gitlab-qa/-/issues work-around was suggested in <https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4717>. A feature proposal to segregate access control regarding running pipelines from ability to push/merge was also created at <https://gitlab.com/gitlab-org/gitlab/-/issues/24585>. -#### With Pipeline for Merged Results +#### With merged results pipelines -In a Pipeline for Merged Results, the pipeline runs on a new ref that contains the merge result of the source and target branch. +In a merged results pipeline, the pipeline runs on a new ref that contains the merge result of the source and target branch. However, this ref is not available to the `gitlab-qa-mirror` pipeline. -For this reason, the end-to-end tests on a Pipeline for Merged Results would use the head of the merge request source branch. +For this reason, the end-to-end tests on a merged results pipeline would use the head of the merge request source branch. ```mermaid graph LR @@ -126,7 +126,7 @@ A --> C B --> C A --> E["E2E tests"] -C --> D["Pipeline for merged results"] +C --> D["Merged results pipeline"] ``` ##### Running custom tests |