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
Jun 09, 2021
by
Mark Lapierre
Committed by
Dan Davison
Jun 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set default branch for QA tests to main
parent
532f8b12
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
...
@@ -57,7 +57,7 @@ module QA
end
end
def
default_branch
def
default_branch
ENV
[
'QA_DEFAULT_BRANCH'
]
||
'ma
ster
'
ENV
[
'QA_DEFAULT_BRANCH'
]
||
'ma
in
'
end
end
def
log_destination
def
log_destination
...
...
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
...
@@ -10,7 +10,7 @@ module QA
let!
(
:target
)
do
let!
(
:target
)
do
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
project
commit
.
project
=
project
commit
.
branch
=
'master'
commit
.
branch
=
project
.
default_branch
commit
.
add_files
([
commit
.
add_files
([
{
file_path:
'.gitlab/CODEOWNERS'
,
content:
'* @root'
}
{
file_path:
'.gitlab/CODEOWNERS'
,
content:
'* @root'
}
])
])
...
@@ -21,7 +21,7 @@ module QA
...
@@ -21,7 +21,7 @@ module QA
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
Resource
::
Repository
::
Commit
.
fabricate_via_api!
do
|
commit
|
commit
.
project
=
project
commit
.
project
=
project
commit
.
branch
=
'codeowners_test'
commit
.
branch
=
'codeowners_test'
commit
.
start_branch
=
'master'
commit
.
start_branch
=
project
.
default_branch
commit
.
add_files
([
commit
.
add_files
([
{
file_path:
'test1.txt'
,
content:
'1'
}
{
file_path:
'test1.txt'
,
content:
'1'
}
])
])
...
@@ -50,13 +50,13 @@ module QA
...
@@ -50,13 +50,13 @@ module QA
# so we unprotect it first and then protect it again with the desired parameters
# so we unprotect it first and then protect it again with the desired parameters
Resource
::
ProtectedBranch
.
unprotect_via_api!
do
|
branch
|
Resource
::
ProtectedBranch
.
unprotect_via_api!
do
|
branch
|
branch
.
project
=
project
branch
.
project
=
project
branch
.
branch_name
=
'master'
branch
.
branch_name
=
project
.
default_branch
end
end
Resource
::
ProtectedBranch
.
fabricate_via_api!
do
|
branch
|
Resource
::
ProtectedBranch
.
fabricate_via_api!
do
|
branch
|
branch
.
project
=
project
branch
.
project
=
project
branch
.
new_branch
=
false
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_push
=
{
roles:
Resource
::
ProtectedBranch
::
Roles
::
NO_ONE
}
branch
.
allowed_to_merge
=
{
roles:
Resource
::
ProtectedBranch
::
Roles
::
MAINTAINERS
}
branch
.
allowed_to_merge
=
{
roles:
Resource
::
ProtectedBranch
::
Roles
::
MAINTAINERS
}
branch
.
require_code_owner_approval
=
true
branch
.
require_code_owner_approval
=
true
...
...
qa/spec/specs/helpers/context_selector_spec.rb
View file @
dd3c5312
...
@@ -189,9 +189,9 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
...
@@ -189,9 +189,9 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do
it
'runs on default branch pipelines'
do
it
'runs on default branch pipelines'
do
group
=
describe_successfully
do
group
=
describe_successfully
do
it
(
'runs on ma
ster pipeline given a single pipeline'
,
only:
{
pipeline: :master
})
{}
it
(
'runs on ma
in pipeline given a single pipeline'
,
only:
{
pipeline: :main
})
{}
it
(
'runs in ma
ster given an array of pipelines'
,
only:
{
pipeline:
[
:canary
,
:master
]
})
{}
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
ster
]
})
{}
it
(
'does not run in non-default pipelines'
,
only:
{
pipeline:
[
:nightly
,
:not_nightly
,
:not_ma
in
]
})
{}
end
end
aggregate_failures
do
aggregate_failures
do
...
...
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