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
dd3c5312
Commit
dd3c5312
authored
3 years ago
by
Mark Lapierre
Committed by
Dan Davison
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set default branch for QA tests to main
parent
532f8b12
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
qa/qa/runtime/env.rb
qa/qa/runtime/env.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_with_protected_branch_and_squashed_commits_spec.rb
...owners_with_protected_branch_and_squashed_commits_spec.rb
+4
-4
qa/spec/specs/helpers/context_selector_spec.rb
qa/spec/specs/helpers/context_selector_spec.rb
+3
-3
No files found.
qa/qa/runtime/env.rb
View file @
dd3c5312
...
...
@@ -57,7 +57,7 @@ module QA
end
def
default_branch
ENV
[
'QA_DEFAULT_BRANCH'
]
||
'ma
ster
'
ENV
[
'QA_DEFAULT_BRANCH'
]
||
'ma
in
'
end
def
log_destination
...
...
This diff is collapsed.
Click to expand it.
qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_with_protected_branch_and_squashed_commits_spec.rb
View file @
dd3c5312
...
...
@@ -10,7 +10,7 @@ module QA
let!
(
:target
)
do
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
project
commit
.
branch
=
'master'
commit
.
branch
=
project
.
default_branch
commit
.
add_files
([
{
file_path:
'.gitlab/CODEOWNERS'
,
content:
'* @root'
}
])
...
...
@@ -21,7 +21,7 @@ module QA
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
project
commit
.
branch
=
'codeowners_test'
commit
.
start_branch
=
'master'
commit
.
start_branch
=
project
.
default_branch
commit
.
add_files
([
{
file_path:
'test1.txt'
,
content:
'1'
}
])
...
...
@@ -50,13 +50,13 @@ module QA
# so we unprotect it first and then protect it again with the desired parameters
Resource
::
ProtectedBranch
.
unprotect_via_api!
do
|
branch
|
branch
.
project
=
project
branch
.
branch_name
=
'master'
branch
.
branch_name
=
project
.
default_branch
end
Resource
::
ProtectedBranch
.
fabricate_via_api!
do
|
branch
|
branch
.
project
=
project
branch
.
new_branch
=
false
branch
.
branch_name
=
'master'
branch
.
branch_name
=
project
.
default_branch
branch
.
allowed_to_push
=
{
roles:
Resource
::
ProtectedBranch
::
Roles
::
NO_ONE
}
branch
.
allowed_to_merge
=
{
roles:
Resource
::
ProtectedBranch
::
Roles
::
MAINTAINERS
}
branch
.
require_code_owner_approval
=
true
...
...
This diff is collapsed.
Click to expand it.
qa/spec/specs/helpers/context_selector_spec.rb
View file @
dd3c5312
...
...
@@ -189,9 +189,9 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
it
'runs on default branch pipelines'
do
group
=
describe_successfully
do
it
(
'runs on ma
ster pipeline given a single pipeline'
,
only:
{
pipeline: :master
})
{}
it
(
'runs in ma
ster given an array of pipelines'
,
only:
{
pipeline:
[
:canary
,
:master
]
})
{}
it
(
'does not run in non-default pipelines'
,
only:
{
pipeline:
[
:nightly
,
:not_nightly
,
:not_ma
ster
]
})
{}
it
(
'runs on ma
in pipeline given a single pipeline'
,
only:
{
pipeline: :main
})
{}
it
(
'runs in ma
in given an array of pipelines'
,
only:
{
pipeline:
[
:canary
,
:main
]
})
{}
it
(
'does not run in non-default pipelines'
,
only:
{
pipeline:
[
:nightly
,
:not_nightly
,
:not_ma
in
]
})
{}
end
aggregate_failures
do
...
...
This diff is collapsed.
Click to expand it.
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