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
978703ab
Commit
978703ab
authored
Mar 09, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retry apt-get installation and bundle install
parent
af434016
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
8 deletions
+20
-8
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
scripts/prepare_build.sh
scripts/prepare_build.sh
+19
-7
No files found.
.gitlab-ci.yml
View file @
978703ab
...
...
@@ -23,7 +23,7 @@ before_script:
-
cp config/gitlab.yml.example config/gitlab.yml
-
touch log/application.log
-
touch log/test.log
-
bundle install --without postgres production --jobs $(nproc)
"${FLAGS[@]}"
-
bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
-
RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate
stages
:
...
...
scripts/prepare_build.sh
View file @
978703ab
...
...
@@ -2,15 +2,27 @@
if
[
-f
/.dockerinit
]
;
then
mkdir
-p
vendor
if
[
!
-e
vendor/phantomjs_1.9.8-0jessie_amd64.deb
]
;
then
# Install phantomjs package
pushd
vendor
if
[
!
-e
phantomjs_1.9.8-0jessie_amd64.deb
]
;
then
wget
-q
https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
mv
phantomjs_1.9.8-0jessie_amd64.deb vendor/
fi
dpkg
-i
vendor/phantomjs_1.9.8-0jessie_amd64.deb
dpkg
-i
phantomjs_1.9.8-0jessie_amd64.deb
popd
# Try to install packages
for
i
in
$(
seq
1 3
)
;
do
apt-get update
-yqqq
||
true
apt-get update
-qq
apt-get
-o
dir
::cache::archives
=
"vendor/apt"
install
-y
-qq
--force-yes
\
libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip
if
apt-get
-o
dir
::cache::archives
=
"vendor/apt"
install
-y
-qq
--force-yes
\
libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip
;
then
break
fi
sleep
3s
echo
"Retrying package installation..."
fi
cp
config/database.yml.mysql config/database.yml
sed
-i
's/username:.*/username: root/g'
config/database.yml
...
...
@@ -20,7 +32,7 @@ if [ -f /.dockerinit ]; then
cp
config/resque.yml.example config/resque.yml
sed
-i
's/localhost/redis/g'
config/resque.yml
export
FLAGS
=(
--path
vendor
)
export
FLAGS
=(
--path
vendor
--retry
3
)
else
export
PATH
=
$HOME
/bin:/usr/local/bin:/usr/bin:/bin
cp
config/database.yml.mysql config/database.yml
...
...
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