Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
33de07ba
Commit
33de07ba
authored
May 03, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Factorize common :only definition in .gitlab-ci.yml
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
6813c9ef
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
.gitlab-ci.yml
.gitlab-ci.yml
+8
-5
No files found.
.gitlab-ci.yml
View file @
33de07ba
...
...
@@ -139,6 +139,13 @@ stages:
<<
:
*only-master-and-ee-or-mysql
<<
:
*except-docs
.only-canonical-masters
:
&only-canonical-masters
only
:
-
master@gitlab-org/gitlab-ce
-
master@gitlab-org/gitlab-ee
-
master@gitlab/gitlabhq
-
master@gitlab/gitlab-ee
# Trigger a package build on omnibus-gitlab repository
build-package
:
...
...
@@ -168,17 +175,13 @@ knapsack:
update-knapsack
:
<<
:
*knapsack-state
<<
:
*dedicated-runner
<<
:
*only-canonical-masters
stage
:
post-test
script
:
-
scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec_pg_node_*.json
-
scripts/merge-reports ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/spinach_pg_node_*.json
-
'
[[
-z
${KNAPSACK_S3_BUCKET}
]]
||
scripts/sync-reports
put
$KNAPSACK_S3_BUCKET
$KNAPSACK_RSPEC_SUITE_REPORT_PATH
$KNAPSACK_SPINACH_SUITE_REPORT_PATH'
-
rm -f knapsack/${CI_PROJECT_NAME}/*_node_*.json
only
:
-
master@gitlab-org/gitlab-ce
-
master@gitlab-org/gitlab-ee
-
master@gitlab/gitlabhq
-
master@gitlab/gitlab-ee
setup-test-env
:
<<
:
*use-pg
...
...
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