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
a4673f6f
Commit
a4673f6f
authored
Jul 30, 2018
by
Balasankar "Balu" C
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use cng-mirror project for review app images
parent
63e4129d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
scripts/review-apps.sh
scripts/review-apps.sh
+8
-8
scripts/trigger-build
scripts/trigger-build
+1
-1
No files found.
scripts/review-apps.sh
View file @
a4673f6f
...
...
@@ -80,14 +80,14 @@ function deploy() {
replicas
=
"1"
service_enabled
=
"false"
postgres_enabled
=
"
$POSTGRES_ENABLED
"
gitlab_migrations_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitlab-rails-ce"
gitlab_sidekiq_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce"
gitlab_unicorn_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitlab-unicorn-ce"
gitlab_migrations_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitlab-rails-ce"
gitlab_sidekiq_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitlab-sidekiq-ce"
gitlab_unicorn_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitlab-unicorn-ce"
if
[[
"
$CI_PROJECT_NAME
"
==
"gitlab-ee"
]]
;
then
gitlab_migrations_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitlab-rails-ee"
gitlab_sidekiq_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ee"
gitlab_unicorn_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitlab-unicorn-ee"
gitlab_migrations_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitlab-rails-ee"
gitlab_sidekiq_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitlab-sidekiq-ee"
gitlab_unicorn_image_repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitlab-unicorn-ee"
fi
# canary uses stable db
...
...
@@ -138,9 +138,9 @@ function deploy() {
--set
gitlab.sidekiq.image.tag
=
"
$CI_COMMIT_REF_NAME
"
\
--set
gitlab.unicorn.image.repository
=
"
$gitlab_unicorn_image_repository
"
\
--set
gitlab.unicorn.image.tag
=
"
$CI_COMMIT_REF_NAME
"
\
--set
gitlab.gitaly.image.repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitaly"
\
--set
gitlab.gitaly.image.repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitaly"
\
--set
gitlab.gitaly.image.tag
=
"v
$GITALY_VERSION
"
\
--set
gitlab.gitlab-shell.image.repository
=
"registry.gitlab.com/gitlab-org/build/cng/gitlab-shell"
\
--set
gitlab.gitlab-shell.image.repository
=
"registry.gitlab.com/gitlab-org/build/cng
-mirror
/gitlab-shell"
\
--set
gitlab.gitlab-shell.image.tag
=
"v
$GITLAB_SHELL_VERSION
"
\
--namespace
=
"
$KUBE_NAMESPACE
"
\
--version
=
"
$CI_PIPELINE_ID
-
$CI_JOB_ID
"
\
...
...
scripts/trigger-build
View file @
a4673f6f
...
...
@@ -6,7 +6,7 @@ require 'cgi'
module
Trigger
OMNIBUS_PROJECT_PATH
=
'gitlab-org/omnibus-gitlab'
.
freeze
CNG_PROJECT_PATH
=
'gitlab-org/build/CNG'
.
freeze
CNG_PROJECT_PATH
=
'gitlab-org/build/CNG
-mirror
'
.
freeze
TOKEN
=
ENV
[
'BUILD_TRIGGER_TOKEN'
]
def
self
.
ee?
...
...
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