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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
dc2a482b
Commit
dc2a482b
authored
Mar 19, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the .review-deploy-base job so that env variables are passed
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
68aacd65
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
.gitlab-ci.yml
.gitlab-ci.yml
+3
-11
scripts/review_apps/review-apps.sh
scripts/review_apps/review-apps.sh
+10
-0
No files found.
.gitlab-ci.yml
View file @
dc2a482b
...
@@ -1053,15 +1053,7 @@ schedule:review-build-cng:
...
@@ -1053,15 +1053,7 @@ schedule:review-build-cng:
-
source ./scripts/review_apps/review-apps.sh
-
source ./scripts/review_apps/review-apps.sh
script
:
script
:
-
wait_for_job_to_be_done "review-build-cng"
-
wait_for_job_to_be_done "review-build-cng"
after_script
:
-
perform_review_app_deployment
-
source ./scripts/review_apps/review-apps.sh
-
check_kube_domain
-
download_gitlab_chart
-
ensure_namespace
-
install_tiller
-
install_external_dns
-
time deploy
-
add_license
review-deploy
:
review-deploy
:
<<
:
*review-deploy-base
<<
:
*review-deploy-base
...
@@ -1071,6 +1063,7 @@ schedule:review-deploy:
...
@@ -1071,6 +1063,7 @@ schedule:review-deploy:
<<
:
*review-schedules-only
<<
:
*review-schedules-only
script
:
script
:
-
wait_for_job_to_be_done "schedule:review-build-cng"
-
wait_for_job_to_be_done "schedule:review-build-cng"
-
perform_review_app_deployment
.review-qa-base
:
&review-qa-base
.review-qa-base
:
&review-qa-base
<<
:
*review-docker
<<
:
*review-docker
...
@@ -1117,8 +1110,7 @@ review-qa-all:
...
@@ -1117,8 +1110,7 @@ review-qa-all:
<<
:
*review-qa-base
<<
:
*review-qa-base
script
:
script
:
-
wait_for_job_to_be_done "review-deploy"
-
wait_for_job_to_be_done "review-deploy"
after_script
:
-
mkdir -p gitlab-exporter
-
mkdir gitlab-exporter
-
wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
-
wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
-
mkdir sitespeed-results
-
mkdir sitespeed-results
-
docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.3.1 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "$CI_ENVIRONMENT_URL"
-
docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io:6.3.1 --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "$CI_ENVIRONMENT_URL"
...
...
scripts/review_apps/review-apps.sh
View file @
dc2a482b
...
@@ -4,6 +4,16 @@ export TILLER_NAMESPACE="$KUBE_NAMESPACE"
...
@@ -4,6 +4,16 @@ export TILLER_NAMESPACE="$KUBE_NAMESPACE"
function
echoerr
()
{
printf
"
\0
33[0;31m%s
\n\0
33[0m"
"
$*
"
>
&2
;
}
function
echoerr
()
{
printf
"
\0
33[0;31m%s
\n\0
33[0m"
"
$*
"
>
&2
;
}
function
echoinfo
()
{
printf
"
\0
33[0;33m%s
\n\0
33[0m"
"
$*
"
>
&2
;
}
function
echoinfo
()
{
printf
"
\0
33[0;33m%s
\n\0
33[0m"
"
$*
"
>
&2
;
}
function
perform_review_app_deployment
()
{
check_kube_domain
download_gitlab_chart
ensure_namespace
install_tiller
install_external_dns
time
deploy
add_license
}
function
check_kube_domain
()
{
function
check_kube_domain
()
{
if
[
-z
${
REVIEW_APPS_DOMAIN
+x
}
]
;
then
if
[
-z
${
REVIEW_APPS_DOMAIN
+x
}
]
;
then
echo
"In order to deploy or use Review Apps, REVIEW_APPS_DOMAIN variable must be set"
echo
"In order to deploy or use Review Apps, REVIEW_APPS_DOMAIN variable must be set"
...
...
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