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
1f2effb1
Commit
1f2effb1
authored
Jun 24, 2018
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move review-app.yml CI template to an EE specific directory
parent
1f6b4434
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
ee/ci/.review-app.yml
ee/ci/.review-app.yml
+4
-4
No files found.
.gitlab-ci.yml
View file @
1f2effb1
...
...
@@ -38,7 +38,7 @@ variables:
ELASTIC_URL
:
"
http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH
:
knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
include
:
'
ci/.review-app.yml'
include
:
'
ee/
ci/.review-app.yml'
before_script
:
-
bundle --version
...
...
ci/.review-app.yml
→
ee/
ci/.review-app.yml
View file @
1f2effb1
# Review apps related tasks
# TODO, duplicated this section from .gitlab-ci.yml. Can this be done differently?
.duplicated-setup
:
&duplicated-setup
retry
:
1
tags
:
...
...
@@ -21,8 +22,7 @@ review-app-image:
only
:
-
//@gitlab-org/gitlab-ee
.auto_devops
:
&auto_devops
|
# Auto DevOps variables and functions
.reviewapps_deploy
:
&reviewapps_deploy
|
[[ "$TRACE" ]] && set -x
export TILLER_NAMESPACE=$KUBE_NAMESPACE
...
...
@@ -196,7 +196,7 @@ review:
image
:
registry.gitlab.com/charts/gitlab:latest
stage
:
post-test
before_script
:
-
*
auto_devops
-
*
reviewapps_deploy
script
:
-
export GITLAB_SHELL_VERSION=$(< GITLAB_SHELL_VERSION)
-
export GITALY_VERSION=$(< GITALY_SERVER_VERSION)
...
...
@@ -226,7 +226,7 @@ stop_review:
image
:
registry.gitlab.com/charts/gitlab:latest
stage
:
post-cleanup
before_script
:
-
*
auto_devops
-
*
reviewapps_deploy
variables
:
GIT_CHECKOUT
:
"
false"
script
:
...
...
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