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
47338f6c
Commit
47338f6c
authored
Feb 05, 2020
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use 'rules' for '.gitlab/ci/qa.gitlab-ci.yml' jobs
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
40a939a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
6 deletions
+51
-6
.gitlab/ci/qa.gitlab-ci.yml
.gitlab/ci/qa.gitlab-ci.yml
+51
-6
No files found.
.gitlab/ci/qa.gitlab-ci.yml
View file @
47338f6c
...
@@ -6,6 +6,14 @@
...
@@ -6,6 +6,14 @@
.if-canonical-gitlab-merge-request
:
&if-canonical-gitlab-merge-request
.if-canonical-gitlab-merge-request
:
&if-canonical-gitlab-merge-request
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_NAMESPACE
==
"gitlab-org"
&&
$CI_MERGE_REQUEST_IID'
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_NAMESPACE
==
"gitlab-org"
&&
$CI_MERGE_REQUEST_IID'
# Make sure to update all the similar conditions in other CI config files if you modify these conditions
.if-not-ee
:
&if-not-ee
if
:
'
$CI_PROJECT_NAME
!~
/^gitlab(-ee)?$/'
# Make sure to update all the similar conditions in other CI config files if you modify these conditions
.if-default-refs
:
&if-default-refs
if
:
'
$CI_COMMIT_REF_NAME
==
"master"
||
$CI_COMMIT_REF_NAME
=~
/^[\d-]+-stable(-ee)?$/
||
$CI_COMMIT_REF_NAME
=~
/^\d+-\d+-auto-deploy-\d+$/
||
$CI_COMMIT_REF_NAME
=~
/^security\//
||
$CI_MERGE_REQUEST_IID
||
$CI_COMMIT_TAG'
# Make sure to update all the similar patterns in other CI config files if you modify these patterns
# Make sure to update all the similar patterns in other CI config files if you modify these patterns
.code-patterns
:
&code-patterns
.code-patterns
:
&code-patterns
-
"
.gitlab/ci/**/*"
-
"
.gitlab/ci/**/*"
...
@@ -27,12 +35,43 @@
...
@@ -27,12 +35,43 @@
-
"
.dockerignore"
-
"
.dockerignore"
-
"
qa/**/*"
-
"
qa/**/*"
# Make sure to update all the similar patterns in other CI config files if you modify these patterns
.code-qa-patterns
:
&code-qa-patterns
-
"
.gitlab/ci/**/*"
-
"
.{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
-
"
.{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
-
"
.csscomb.json"
-
"
Dockerfile.assets"
-
"
*_VERSION"
-
"
Gemfile{,.lock}"
-
"
Rakefile"
-
"
{babel.config,jest.config}.js"
-
"
config.ru"
-
"
{package.json,yarn.lock}"
-
"
{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
-
"
doc/api/graphql/reference/*"
# Files in this folder are auto-generated
# QA changes
-
"
.dockerignore"
-
"
qa/**/*"
.qa:rules:ee-and-foss:
rules
:
-
<<
:
*if-default-refs
changes
:
*code-qa-patterns
when
:
on_success
.qa:rules:ee-only:
rules
:
-
<<
:
*if-not-ee
when
:
never
-
<<
:
*if-default-refs
changes
:
*code-qa-patterns
when
:
on_success
.qa-job-base
:
.qa-job-base
:
extends
:
extends
:
-
.default-tags
-
.default-tags
-
.default-retry
-
.default-retry
-
.default-only
-
.only:changes-code-qa
stage
:
test
stage
:
test
dependencies
:
[]
dependencies
:
[]
cache
:
cache
:
...
@@ -46,26 +85,32 @@
...
@@ -46,26 +85,32 @@
-
bundle check
-
bundle check
qa:internal:
qa:internal:
extends
:
.qa-job-base
extends
:
-
.qa-job-base
-
.qa:rules:ee-and-foss
script
:
script
:
-
bundle exec rspec
-
bundle exec rspec
qa:internal-foss:
qa:internal-foss:
extends
:
extends
:
-
.qa-job-base
-
.qa-job-base
-
.only-ee-as-if-foss
-
.qa:rules:ee-only
-
.as-if-foss
script
:
script
:
-
bundle exec rspec
-
bundle exec rspec
qa:selectors:
qa:selectors:
extends
:
.qa-job-base
extends
:
-
.qa-job-base
-
.qa:rules:ee-and-foss
script
:
script
:
-
bundle exec bin/qa Test::Sanity::Selectors
-
bundle exec bin/qa Test::Sanity::Selectors
qa:selectors-foss:
qa:selectors-foss:
extends
:
extends
:
-
qa:selectors
-
qa:selectors
-
.only-ee-as-if-foss
-
.qa:rules:ee-only
-
.as-if-foss
.package-and-qa-base
:
.package-and-qa-base
:
image
:
ruby:2.6-alpine
image
:
ruby:2.6-alpine
...
...
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