BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9c0b965d
Commit
9c0b965d
authored
Jun 07, 2016
by
Kamil Trzcinski
Committed by
Z.J. van de Weg
Sep 30, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use custom Ruby images to test builds
It allows us to remove redundant steps of installing required dependencies for every build.
parent
6591b594
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
17 deletions
+3
-17
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
CHANGELOG
CHANGELOG
+1
-0
prepare_build.sh
scripts/prepare_build.sh
+0
-15
No files found.
.gitlab-ci.yml
View file @
9c0b965d
image
:
"
r
uby:2.3.1
"
image
:
"
r
egistry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3
"
cache
:
key
:
"
ruby-231"
...
...
@@ -141,7 +141,7 @@ spinach 9 10: *spinach-knapsack
# Execute all testing suites against Ruby 2.1
.ruby-21
:
&ruby-21
image
:
"
r
uby:
2.1"
image
:
"
r
egistry.gitlab.com/gitlab-org/gitlab-build-images:ruby-
2.1"
<<
:
*use-db
only
:
-
master
...
...
CHANGELOG
View file @
9c0b965d
...
...
@@ -882,6 +882,7 @@ v 8.9.0
- Add API endpoint for Sidekiq Metrics !4653
- Refactoring Award Emoji with API support for Issues and MergeRequests
- Use Knapsack to evenly distribute tests across multiple nodes
- Use custom Ruby images to test builds (registry.gitlab.com/gitlab-org/gitlab-build-images:*)
- Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
- Don't allow MRs to be merged when commits were added since the last review / page load
- Add DB index on users.state
...
...
scripts/prepare_build.sh
View file @
9c0b965d
...
...
@@ -16,21 +16,6 @@ retry() {
}
if
[
-f
/.dockerenv
]
||
[
-f
./dockerinit
]
;
then
mkdir
-p
vendor/apt
# Install phantomjs package
pushd
vendor/apt
PHANTOMJS_FILE
=
"phantomjs-
$PHANTOMJS_VERSION
-linux-x86_64"
if
[
!
-d
"
$PHANTOMJS_FILE
"
]
;
then
curl
-q
-L
"https://s3.amazonaws.com/gitlab-build-helpers/
$PHANTOMJS_FILE
.tar.bz2"
|
tar
jx
fi
cp
"
$PHANTOMJS_FILE
/bin/phantomjs"
"/usr/bin/"
popd
# Try to install packages
retry
'apt-get update -yqqq; apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \
libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip'
cp
config/database.yml.mysql config/database.yml
sed
-i
's/username:.*/username: root/g'
config/database.yml
sed
-i
's/password:.*/password:/g'
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