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
7d525992
Commit
7d525992
authored
Feb 09, 2022
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Push gitlab-ci.yml only once in mwps test
parent
a01669c3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
10 deletions
+24
-10
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
...create/merge_request/merge_when_pipeline_succeeds_spec.rb
+24
-10
No files found.
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
View file @
7d525992
...
@@ -31,6 +31,26 @@ module QA
...
@@ -31,6 +31,26 @@ module QA
it
'merges after pipeline succeeds'
do
it
'merges after pipeline succeeds'
do
transient_test
=
repeat
>
1
transient_test
=
repeat
>
1
# Push a new pipeline config file
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
project
commit
.
commit_message
=
'Add .gitlab-ci.yml'
commit
.
add_files
(
[
{
file_path:
'.gitlab-ci.yml'
,
content:
<<~
EOF
test:
tags: ["runner-for-
#{
project
.
name
}
"]
script: sleep 20
only:
- merge_requests
EOF
}
]
)
end
repeat
.
times
do
|
i
|
repeat
.
times
do
|
i
|
QA
::
Runtime
::
Logger
.
info
(
"Transient bug test - Trial
#{
i
}
"
)
if
transient_test
QA
::
Runtime
::
Logger
.
info
(
"Transient bug test - Trial
#{
i
}
"
)
if
transient_test
...
@@ -55,22 +75,16 @@ module QA
...
@@ -55,22 +75,16 @@ module QA
# start it.
# start it.
merge_request
.
visit!
merge_request
.
visit!
# Push a new
pipeline config fil
e
# Push a new
file to trigger a new pipelin
e
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
project
commit
.
project
=
project
commit
.
commit_message
=
'Add
.gitlab-ci.yml
'
commit
.
commit_message
=
'Add
new file
'
commit
.
branch
=
branch_name
commit
.
branch
=
branch_name
commit
.
add_files
(
commit
.
add_files
(
[
[
{
{
file_path:
'.gitlab-ci.yml'
,
file_path:
"
#{
branch_name
}
-file.md"
,
content:
<<~
EOF
content:
"file content"
test:
tags: ["runner-for-
#{
project
.
name
}
"]
script: sleep 20
only:
- merge_requests
EOF
}
}
]
]
)
)
...
...
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