Commit 1f2effb1 authored by Marin Jankovski's avatar Marin Jankovski

Move review-app.yml CI template to an EE specific directory

parent 1f6b4434
......@@ -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
......
# 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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment