Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ce7a69b7
Commit
ce7a69b7
authored
Feb 28, 2020
by
Albert Salim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Document E2E tests on Pipeline for Merged Results
parent
159749ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
2 deletions
+23
-2
doc/development/testing_guide/end_to_end/index.md
doc/development/testing_guide/end_to_end/index.md
+21
-0
scripts/trigger-build
scripts/trigger-build
+2
-2
No files found.
doc/development/testing_guide/end_to_end/index.md
View file @
ce7a69b7
...
...
@@ -88,6 +88,27 @@ subgraph "gitlab-qa pipeline"
Please note, we plan to
[
add more specific information
](
https://gitlab.com/gitlab-org/quality/team-tasks/issues/156
)
about the tests included in each job/scenario that runs in
`gitlab-qa`
.
#### With Pipeline for Merged Results
In a Pipeline for Merged Results, 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`
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.
```
mermaid
graph LR
A["a1b1c1 - branch HEAD (CI_MERGE_REQUEST_SOURCE_BRANCH_SHA)"]
B["x1y1z1 - master HEAD"]
C["d1e1f1 - merged results (CI_COMMIT_SHA)"]
A --> C
B --> C
A --> E["E2E tests"]
C --> D["Pipeline for merged results"]
```
##### Running custom tests
The
[
existing scenarios
](
https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md
)
...
...
scripts/trigger-build
View file @
ce7a69b7
...
...
@@ -84,7 +84,7 @@ module Trigger
end
def
base_variables
# Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts
# Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts
due to pipeline for merged results
{
'GITLAB_REF_SLUG'
=>
ENV
[
'CI_COMMIT_TAG'
]
?
ENV
[
'CI_COMMIT_REF_NAME'
]
:
ENV
[
'CI_COMMIT_REF_SLUG'
],
'TRIGGERED_USER'
=>
ENV
[
'TRIGGERED_USER'
]
||
ENV
[
'GITLAB_USER_NAME'
],
...
...
@@ -126,7 +126,7 @@ module Trigger
end
def
extra_variables
# Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts
# Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts
due to pipeline for merged results
{
'GITLAB_VERSION'
=>
ENV
[
'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'
],
'ALTERNATIVE_SOURCES'
=>
'true'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment