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
0d0cb5b4
Commit
0d0cb5b4
authored
Feb 06, 2020
by
Albert Salim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move `frontend:fixtures` into separate job & stage
parent
312aa401
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
4 deletions
+37
-4
.gitlab-ci.yml
.gitlab-ci.yml
+1
-0
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+36
-4
No files found.
.gitlab-ci.yml
View file @
0d0cb5b4
...
@@ -3,6 +3,7 @@ image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.1
...
@@ -3,6 +3,7 @@ image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.1
stages
:
stages
:
-
sync
-
sync
-
prepare
-
prepare
-
fixtures
-
test
-
test
-
post-test
-
post-test
-
review-prepare
-
review-prepare
...
...
.gitlab/ci/frontend.gitlab-ci.yml
View file @
0d0cb5b4
...
@@ -120,6 +120,40 @@ compile-assets pull-cache as-if-foss:
...
@@ -120,6 +120,40 @@ compile-assets pull-cache as-if-foss:
policy
:
pull
policy
:
pull
key
:
"
assets-compile:v9:foss"
key
:
"
assets-compile:v9:foss"
.frontend-fixtures-base
:
extends
:
-
.default-tags
-
.default-retry
-
.default-cache
-
.default-before_script
-
.use-pg9
stage
:
fixtures
needs
:
[
"
setup-test-env"
,
"
compile-assets
pull-cache"
]
script
:
-
date
-
scripts/gitaly-test-spawn
-
date
-
bundle exec rake frontend:fixtures
artifacts
:
name
:
frontend-fixtures
expire_in
:
31d
when
:
always
paths
:
-
node_modules
-
public/assets
-
tmp/tests/frontend/
frontend-fixtures
:
extends
:
-
.frontend-fixtures-base
-
.frontend:rules:default-frontend-jobs
frontend-fixtures-as-if-foss
:
extends
:
-
.frontend-fixtures-base
-
.frontend:rules:default-frontend-jobs-as-if-foss
-
.as-if-foss
.frontend-job-base
:
.frontend-job-base
:
extends
:
extends
:
-
.default-tags
-
.default-tags
...
@@ -128,7 +162,6 @@ compile-assets pull-cache as-if-foss:
...
@@ -128,7 +162,6 @@ compile-assets pull-cache as-if-foss:
-
.default-before_script
-
.default-before_script
-
.use-pg9
-
.use-pg9
stage
:
test
stage
:
test
needs
:
[
"
setup-test-env"
,
"
compile-assets
pull-cache"
]
.karma-base
:
.karma-base
:
extends
:
.frontend-job-base
extends
:
.frontend-job-base
...
@@ -167,9 +200,6 @@ karma-as-if-foss:
...
@@ -167,9 +200,6 @@ karma-as-if-foss:
.jest-base
:
.jest-base
:
extends
:
.frontend-job-base
extends
:
.frontend-job-base
script
:
script
:
-
scripts/gitaly-test-spawn
-
date
-
bundle exec rake frontend:fixtures
-
date
-
date
-
yarn jest --ci --coverage
-
yarn jest --ci --coverage
cache
:
cache
:
...
@@ -182,6 +212,7 @@ jest:
...
@@ -182,6 +212,7 @@ jest:
extends
:
extends
:
-
.jest-base
-
.jest-base
-
.frontend:rules:default-frontend-jobs
-
.frontend:rules:default-frontend-jobs
needs
:
[
"
frontend-fixtures"
]
artifacts
:
artifacts
:
name
:
coverage-frontend
name
:
coverage-frontend
expire_in
:
31d
expire_in
:
31d
...
@@ -198,6 +229,7 @@ jest-as-if-foss:
...
@@ -198,6 +229,7 @@ jest-as-if-foss:
-
.jest-base
-
.jest-base
-
.frontend:rules:default-frontend-jobs-as-if-foss
-
.frontend:rules:default-frontend-jobs-as-if-foss
-
.as-if-foss
-
.as-if-foss
needs
:
[
"
frontend-fixtures-as-if-foss"
]
cache
:
cache
:
policy
:
pull
policy
:
pull
...
...
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