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
5ffb6e10
Commit
5ffb6e10
authored
Apr 30, 2020
by
Hordur Freyr Yngvason
Committed by
Thong Kuah
May 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move Auto DevOps Code-Quality.gitlab-ci.yml to rules
Part of
https://gitlab.com/gitlab-org/gitlab/-/issues/213336
parent
673e08a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
95 additions
and
7 deletions
+95
-7
changelogs/unreleased/move-code-quality-template-to-rules-syntax.yml
...unreleased/move-code-quality-template-to-rules-syntax.yml
+5
-0
lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
+4
-7
spec/lib/gitlab/ci/templates/Jobs/code_quality_gitlab_ci_yaml_spec.rb
...lab/ci/templates/Jobs/code_quality_gitlab_ci_yaml_spec.rb
+86
-0
No files found.
changelogs/unreleased/move-code-quality-template-to-rules-syntax.yml
0 → 100644
View file @
5ffb6e10
---
title
:
Move Code-Quality.gitlab-ci.yml to `rules` syntax
merge_request
:
30896
author
:
type
:
changed
lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
View file @
5ffb6e10
...
...
@@ -26,10 +26,7 @@ code_quality:
codequality
:
gl-code-quality-report.json
expire_in
:
1 week
dependencies
:
[]
only
:
refs
:
-
branches
-
tags
except
:
variables
:
-
$CODE_QUALITY_DISABLED
rules
:
-
if
:
'
$CODE_QUALITY_DISABLED'
when
:
never
-
if
:
'
$CI_COMMIT_TAG
||
$CI_COMMIT_BRANCH'
spec/lib/gitlab/ci/templates/Jobs/code_quality_gitlab_ci_yaml_spec.rb
0 → 100644
View file @
5ffb6e10
# frozen_string_literal: true
require
'spec_helper'
describe
'Jobs/Code-Quality.gitlab-ci.yml'
do
subject
(
:template
)
{
Gitlab
::
Template
::
GitlabCiYmlTemplate
.
find
(
'Jobs/Code-Quality'
)
}
describe
'the created pipeline'
do
let_it_be
(
:user
)
{
create
(
:admin
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:default_branch
)
{
'master'
}
let
(
:pipeline_ref
)
{
default_branch
}
let
(
:service
)
{
Ci
::
CreatePipelineService
.
new
(
project
,
user
,
ref:
pipeline_ref
)
}
let
(
:pipeline
)
{
service
.
execute!
(
:push
)
}
let
(
:build_names
)
{
pipeline
.
builds
.
pluck
(
:name
)
}
before
do
stub_ci_pipeline_yaml_file
(
template
.
content
)
allow_any_instance_of
(
Ci
::
BuildScheduleWorker
).
to
receive
(
:perform
).
and_return
(
true
)
allow
(
project
).
to
receive
(
:default_branch
).
and_return
(
default_branch
)
end
context
'on master'
do
it
'creates the code_quality job'
do
expect
(
build_names
).
to
contain_exactly
(
'code_quality'
)
end
end
context
'on another branch'
do
let
(
:pipeline_ref
)
{
'feature'
}
it
'creates the code_quality job'
do
expect
(
build_names
).
to
contain_exactly
(
'code_quality'
)
end
end
context
'on tag'
do
let
(
:pipeline_ref
)
{
'v1.0.0'
}
it
'creates the code_quality job'
do
expect
(
pipeline
).
to
be_tag
expect
(
build_names
).
to
contain_exactly
(
'code_quality'
)
end
end
context
'on merge request'
do
let
(
:service
)
{
MergeRequests
::
CreatePipelineService
.
new
(
project
,
user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
:simple
,
source_project:
project
)
}
let
(
:pipeline
)
{
service
.
execute
(
merge_request
)
}
it
'has no jobs'
do
expect
(
pipeline
).
to
be_merge_request_event
expect
(
build_names
).
to
be_empty
end
end
context
'CODE_QUALITY_DISABLED is set'
do
before
do
create
(
:ci_variable
,
key:
'CODE_QUALITY_DISABLED'
,
value:
'true'
,
project:
project
)
end
context
'on master'
do
it
'has no jobs'
do
expect
{
pipeline
}.
to
raise_error
(
Ci
::
CreatePipelineService
::
CreateError
)
end
end
context
'on another branch'
do
let
(
:pipeline_ref
)
{
'feature'
}
it
'has no jobs'
do
expect
{
pipeline
}.
to
raise_error
(
Ci
::
CreatePipelineService
::
CreateError
)
end
end
context
'on tag'
do
let
(
:pipeline_ref
)
{
'v1.0.0'
}
it
'has no jobs'
do
expect
{
pipeline
}.
to
raise_error
(
Ci
::
CreatePipelineService
::
CreateError
)
end
end
end
end
end
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