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
0d5a9b98
Commit
0d5a9b98
authored
Oct 29, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use master scripts/review_apps/base-config.yaml to deploy Review Apps
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
9a4ca79b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
.gitlab/ci/review.gitlab-ci.yml
.gitlab/ci/review.gitlab-ci.yml
+1
-0
scripts/review_apps/review-apps.sh
scripts/review_apps/review-apps.sh
+17
-4
No files found.
.gitlab/ci/review.gitlab-ci.yml
View file @
0d5a9b98
...
...
@@ -122,6 +122,7 @@ schedule:review-build-cng:
-
source scripts/utils.sh
-
install_api_client_dependencies_with_apk
-
source scripts/review_apps/review-apps.sh
-
export REVIEW_APP_CONFIG_CHANGED=$(base_config_changed)
script
:
-
date
-
check_kube_domain
...
...
scripts/review_apps/review-apps.sh
View file @
0d5a9b98
...
...
@@ -195,9 +195,22 @@ function download_chart() {
helm dependency build
.
}
function
base_config_changed
()
{
git fetch origin master
--depth
=
50
[
-n
"
$(
git diff origin/master...
--name-only
--
scripts/review_apps/base-config.yaml
)
"
]
}
function
deploy
()
{
local
name
=
"
$CI_ENVIRONMENT_SLUG
"
local
edition
=
"
${
GITLAB_EDITION
-ce
}
"
local
base_config_file_ref
=
"master"
echo
"REVIEW_APP_CONFIG_CHANGED:
${
REVIEW_APP_CONFIG_CHANGED
}
"
if
[
-n
"
${
REVIEW_APP_CONFIG_CHANGED
}
"
]
;
then
base_config_file_ref
=
"
$CI_COMMIT_SHA
"
fi
local
base_config_file
=
"https://gitlab.com/gitlab-org/gitlab/raw/
${
base_config_file_ref
}
/scripts/review_apps/base-config.yaml"
echoinfo
"Deploying
${
name
}
..."
true
IMAGE_REPOSITORY
=
"registry.gitlab.com/gitlab-org/build/cng-mirror"
...
...
@@ -240,11 +253,11 @@ EOF
)
HELM_CMD
=
$(
cat
<<
EOF
$
HELM_CMD
\
$
{
HELM_CMD
}
\
--namespace="
$KUBE_NAMESPACE
"
\
--version="
$
CI_PIPELINE_ID
-
$CI_JOB_ID
"
\
-f "
../scripts/review_apps/base-config.yaml
"
\
"
$
name
" .
--version="
$
{
CI_PIPELINE_ID
}
-
${
CI_JOB_ID
}
"
\
-f "
${
base_config_file
}
"
\
"
$
{
name
}
" .
EOF
)
...
...
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