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
6f1e9f7e
Commit
6f1e9f7e
authored
Nov 21, 2017
by
Jacob Vosmaer (GitLab)
Committed by
Sean McGivern
Nov 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix slow gitaly dev test bundle
parent
15cb13ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
lib/tasks/gitlab/gitaly.rake
lib/tasks/gitlab/gitaly.rake
+1
-3
spec/tasks/gitlab/gitaly_rake_spec.rb
spec/tasks/gitlab/gitaly_rake_spec.rb
+2
-2
No files found.
lib/tasks/gitlab/gitaly.rake
View file @
6f1e9f7e
...
@@ -17,9 +17,7 @@ namespace :gitlab do
...
@@ -17,9 +17,7 @@ namespace :gitlab do
_
,
status
=
Gitlab
::
Popen
.
popen
(
%w[which gmake]
)
_
,
status
=
Gitlab
::
Popen
.
popen
(
%w[which gmake]
)
command
=
status
.
zero?
?
[
'gmake'
]
:
[
'make'
]
command
=
status
.
zero?
?
[
'gmake'
]
:
[
'make'
]
if
Rails
.
env
.
test?
command
<<
'BUNDLE_FLAGS=--no-deployment'
if
Rails
.
env
.
test?
command
+=
%W[BUNDLE_PATH=
#{
Bundler
.
bundle_path
}
]
end
Dir
.
chdir
(
args
.
dir
)
do
Dir
.
chdir
(
args
.
dir
)
do
create_gitaly_configuration
create_gitaly_configuration
...
...
spec/tasks/gitlab/gitaly_rake_spec.rb
View file @
6f1e9f7e
...
@@ -57,7 +57,7 @@ describe 'gitlab:gitaly namespace rake task' do
...
@@ -57,7 +57,7 @@ describe 'gitlab:gitaly namespace rake task' do
it
'calls gmake in the gitaly directory'
do
it
'calls gmake in the gitaly directory'
do
expect
(
Gitlab
::
Popen
).
to
receive
(
:popen
).
with
(
%w[which gmake]
).
and_return
([
'/usr/bin/gmake'
,
0
])
expect
(
Gitlab
::
Popen
).
to
receive
(
:popen
).
with
(
%w[which gmake]
).
and_return
([
'/usr/bin/gmake'
,
0
])
expect
(
main_object
).
to
receive
(
:run_command!
).
with
(
command_preamble
+
%w[gmake BUNDLE_
PATH=/fake/bundle_path
]
).
and_return
(
true
)
expect
(
main_object
).
to
receive
(
:run_command!
).
with
(
command_preamble
+
%w[gmake BUNDLE_
FLAGS=--no-deployment
]
).
and_return
(
true
)
run_rake_task
(
'gitlab:gitaly:install'
,
clone_path
)
run_rake_task
(
'gitlab:gitaly:install'
,
clone_path
)
end
end
...
@@ -70,7 +70,7 @@ describe 'gitlab:gitaly namespace rake task' do
...
@@ -70,7 +70,7 @@ describe 'gitlab:gitaly namespace rake task' do
end
end
it
'calls make in the gitaly directory'
do
it
'calls make in the gitaly directory'
do
expect
(
main_object
).
to
receive
(
:run_command!
).
with
(
command_preamble
+
%w[make BUNDLE_
PATH=/fake/bundle_path
]
).
and_return
(
true
)
expect
(
main_object
).
to
receive
(
:run_command!
).
with
(
command_preamble
+
%w[make BUNDLE_
FLAGS=--no-deployment
]
).
and_return
(
true
)
run_rake_task
(
'gitlab:gitaly:install'
,
clone_path
)
run_rake_task
(
'gitlab:gitaly:install'
,
clone_path
)
end
end
...
...
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