Merge pull request #14 from ruby-bench/rails_on_a_per_commit_basis

Rails on a per commit basis

Author: tgxworld

README.md

@@ -3,12 +3,12 @@
 ## Ruby trunk
 
 #### Build base image for Ruby benchmarks
-```bash
+```
 sudo docker build --no-cache -t rubybench/ruby_trunk .
 ```
 
 #### Run Ruby benchmarks
-```bash
+```
 sudo docker run --rm \
   -e "RUBY_BENCHMARKS=true" \
   -e "RUBY_MEMORY_BENCHMARKS=true" \
@@ -23,13 +23,13 @@ sudo docker run --rm \
 ### Ruby Benchmarks
 
 #### Build base image for Ruby benchmarks
-```bash
+```
 sudo docker build --no-cache -t rubybench/ruby_releases_base .
 sudo docker build --no-cache -t rubybench/ruby_releases .
 ```
 
 #### Run Ruby benchmarks
-```bash
+```
 sudo docker run --rm \
   -e "RUBY_BENCHMARKS=true" \
   -e "RUBY_MEMORY_BENCHMARKS=true" \
@@ -43,18 +43,18 @@ sudo docker run --rm \
 ### Discourse Benchmarks
 
 #### Build base image for Discourse benchmarks
-```bash
+```
 sudo docker build --no-cache -t rubybench/ruby_releases_base .
 sudo docker build --no-cache -t rubybench/ruby_releases_discourse .
 ```
 
 #### Setup containers for Redis server and PostgreSQL
-```bash
+```
 sudo docker run --name discourse_redis -d redis:2.8.19 && sudo docker run --name discourse_postgres -d postgres:9.3.5
 ```
 
 #### Run Discourse benchmarks
-```bash
+```
 sudo docker run --rm \
   --link discourse_postgres:postgres \
   --link discourse_redis:redis \
@@ -69,18 +69,18 @@ sudo docker run --rm \
 ## Benchmarking Discourse against Ruby trunk
 
 #### Build base image for Discourse
-```bash
+```
 cd discourse_benchmarks/ruby_head
 sudo docker build --no-cache -t rubybench/ruby_trunk_discourse .
 ```
 
 #### Setup containers for Redis server and PostgreSQL
-```bash
+```
 sudo docker run --name discourse_redis -d redis:2.8.19 && sudo docker run --name discourse_postgres -d postgres:9.3.5
 ```
 
 #### Run benchmarks
-```bash
+```
 sudo docker run --rm \
   --link discourse_postgres:postgres \
   --link discourse_redis:redis \
@@ -95,7 +95,7 @@ sudo docker run --rm \
 ## Rails Releases
 
 #### Build base image
-```bash
+```
 cd rails/rails_releases/rails_benchmarks
 sudo docker build --no-cache -t rubybench/rails_releases .
 ```
@@ -107,7 +107,7 @@ sudo docker run --name mysql -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -d mysql:5.6.24
 ```
 
 #### Run benchmarks
-```bash
+```
 sudo docker run --rm \
   --link postgres:postgres \
   --link mysql:mysql \
@@ -117,3 +117,29 @@ sudo docker run --rm \
   -e "INCLUDE_PATTERNS=<pattern1,pattern2,pattern3>" \
   rubybench/rails_releases
 ```
+
+## Rails Trunk
+
+#### Build base image
+```
+cd rails/rails_trunk/rails_benchmarks
+sudo docker build --no-cache -t rubybench/rails_trunk .
+```
+
+#### Setup containers for PostgreSQL and MySQL
+```
+sudo docker run --name postgres -d postgres:9.3.5 && \
+sudo docker run --name mysql -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -d mysql:5.6.24
+```
+
+#### Run benchmarks
+```
+sudo docker run --rm \
+  --link postgres:postgres \
+  --link mysql:mysql \
+  -e "RAILS_COMMIT_HASH=<commit sha1>" \
+  -e "API_NAME=<API NAME>" \
+  -e "API_PASSWORD=<API PASSWORD>" \
+  -e "INCLUDE_PATTERNS=<pattern1,pattern2,pattern3>" \
+  rubybench/rails_trunk
+```

base/Dockerfile

@@ -1,16 +1,19 @@
-# rubybench/rubybench:0.2
+# rubybench/rubybench:0.3
 FROM ubuntu:14.04
 MAINTAINER Guo Xiang "[email protected]"
 
 RUN apt-get update
 RUN apt-get install -y autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev git curl libtool libxslt-dev libxml2-dev libpq-dev gawk curl pngcrush python-software-properties software-properties-common tasksel apache2-utils postgresql-client libffi-dev
 
+RUN git config --global user.email "[email protected]" &&\
+    git config --global user.name "Your Name"
+
 RUN git clone https://github.com/sstephenson/rbenv.git /root/.rbenv
 RUN git clone https://github.com/sstephenson/ruby-build.git /root/.rbenv/plugins/ruby-build
 RUN ./root/.rbenv/plugins/ruby-build/install.sh
 ENV PATH /root/.rbenv/bin:$PATH
 RUN echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh # or /etc/profile
 RUN echo 'eval "$(rbenv init -)"' >> ~/.bashrc
 
-RUN /bin/bash -l -c "rbenv install 2.2.1"
-RUN /bin/bash -l -c "rbenv global 2.2.1"
+RUN /bin/bash -l -c "rbenv install 2.2.2"
+RUN /bin/bash -l -c "rbenv global 2.2.2"

rails/rails_releases/rails_benchmarks/Dockerfile

@@ -1,4 +1,4 @@
-FROM rubybench/ruby:0.2
+FROM rubybench/ruby:0.3
 MAINTAINER Alan Guo Xiang Tan "https://twitter.com/tgx_world"
 
 RUN apt-get update

rails/rails_releases/rails_benchmarks/runner

@@ -11,7 +11,6 @@ while ! exec 6<>/dev/tcp/${MYSQL_PORT_3306_TCP_ADDR}/${MYSQL_PORT_3306_TCP_PORT}
   sleep 1
 done
 
-
 dropdb --if-exists -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres rubybench
 createdb -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres rubybench
 echo "DROP DATABASE IF EXISTS rubybench" | mysql -u root -h "$MYSQL_PORT_3306_TCP_ADDR" -P "MYSQL_PORT_3306_TCP_PORT"

rails/rails_trunk/rails_benchmarks/Dockerfile

@@ -0,0 +1,16 @@
+FROM rubybench/ruby:0.3
+MAINTAINER Alan Guo Xiang Tan "https://twitter.com/tgx_world"
+
+ENV RAILS_MASTER 1
+
+RUN apt-get update
+RUN apt-get install -y libmysqlclient-dev sqlite3 libsqlite3-dev postgresql mysql-server-5.6
+
+RUN git clone --verbose --branch master --single-branch https://github.com/ruby-bench/ruby-bench-suite.git
+RUN git clone --verbose --branch master --single-branch https://github.com/rails/rails.git
+RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc && cd /rails && bundle install"
+
+ADD runner runner
+RUN chmod 755 runner
+
+CMD /bin/bash -l -c "./runner"

rails/rails_trunk/rails_benchmarks/runner

@@ -0,0 +1,43 @@
+#!/bin/bash
+set -e
+
+while ! exec 6<>/dev/tcp/${POSTGRES_PORT_5432_TCP_ADDR}/${POSTGRES_PORT_5432_TCP_PORT}; do
+  echo "$(date) - still trying to connect to Postgres server"
+  sleep 1
+done
+
+while ! exec 6<>/dev/tcp/${MYSQL_PORT_3306_TCP_ADDR}/${MYSQL_PORT_3306_TCP_PORT}; do
+  echo "$(date) - still trying to connect to Mysql server"
+  sleep 1
+done
+
+dropdb --if-exists -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres rubybench
+createdb -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres rubybench
+echo "DROP DATABASE IF EXISTS rubybench" | mysql -u root -h "$MYSQL_PORT_3306_TCP_ADDR" -P "MYSQL_PORT_3306_TCP_PORT"
+echo "CREATE DATABASE rubybench" | mysql -u root -h "$MYSQL_PORT_3306_TCP_ADDR" -P "MYSQL_PORT_3306_TCP_PORT"
+
+cd /ruby-bench-suite/rails
+git pull --rebase origin master
+
+if [ "$INCLUDE_PATTERNS" ]; then
+  PATTERNS="--pattern $INCLUDE_PATTERNS"
+fi
+
+cd /rails
+git pull --rebase origin master
+
+if [ -z "$RAILS_COMMIT_HASH" ]; then
+  echo "Running benchmarks using lastest Rails commit"
+else
+  echo "Running benchmarks using Rails commit $RAILS_COMMIT_HASH"
+  git reset --hard $RAILS_COMMIT_HASH
+  bundle install -j4
+fi
+
+cd /ruby-bench-suite/rails
+sed -i "s/gem 'rails', github: 'rails'/gem 'rails', path: '\/rails'/g" Gemfile
+bundle install -j4
+
+echo "Running benchmarks with Rails $RAILS_COMMIT_HASH"
+cd /ruby-bench-suite/rails/benchmarks
+ruby driver.rb $PATTERNS

ruby/ruby_releases/discourse_benchmarks/runner

@@ -1,4 +1,4 @@
-# !/bin/bash
+#!/bin/bash
 set -e
 
 while ! exec 6<>/dev/tcp/${POSTGRES_PORT_5432_TCP_ADDR}/${POSTGRES_PORT_5432_TCP_PORT}; do

ruby/ruby_trunk/discourse_benchmarks/runner

@@ -1,4 +1,4 @@
-# !/bin/bash
+#!/bin/bash
 set -e
 
 cd ruby

ruby/ruby_trunk/ruby_benchmarks/runner

@@ -1,4 +1,4 @@
-# !/bin/bash
+#!/bin/bash
 set -e
 
 cd /ruby-bench-suite