Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci

3 files changed, 32 insertions, 8 deletions

diff --git a/doc/examples/README.md b/doc/examples/README.md
index a33a19a..a0d3c53 100644
--- a/doc/examples/README.md
+++ b/doc/examples/README.md
@@ -25,6 +25,10 @@ The build command is run from [GitlabCi::Build#command](https://gitlab.com/gitla
 + [Build script GitLab CE](build_script_gitlab_ce.md)
 + [Build script for Sencha deploy PhoneGapBuild](build_script_sencha_deploy_phonegapbuild.md)
 
-# Configuring a runner example
+# Configuring runner examples
 
-+ [Configure a runner to run the GitLab CE test suite](configure_a_runner_to_run_the_gitlab_ce_test_suite.md)
++ [For Ruby](configure/ruby.md)
++ We welcome contributions of examples for other environments.
+
+Please see [cookbook-gitlab-test](https://gitlab.com/gitlab-org/cookbook-gitlab-test/blob/master/README.md)
+for instructions how to prepare a server to run CI tests for GitLab.
diff --git a/doc/examples/configure/ruby.md b/doc/examples/configure/ruby.md
new file mode 100644
index 0000000..466e87e
--- /dev/null
+++ b/doc/examples/configure/ruby.md
@@ -0,0 +1,26 @@
+# Example configuring runner for Ruby
+
+In this example, we configure ruby and mysql for testing environment:
+
+```
+# as root
+(
+set -e
+apt-get update
+apt-get upgrade -y
+apt-get install -y curl
+cd /root
+rm -rf cookbooks cookbook-gitlab-test.git
+curl 'https://gitlab.com/gitlab-org/cookbook-gitlab-test/repository/archive.tar.gz?ref=master' | tar -xvz
+mkdir cookbooks
+mv cookbook-gitlab-test.git cookbooks/cookbook-gitlab-test
+curl -L https://www.chef.io/chef/install.sh | bash
+chef-client -z -r 'recipe[cookbook-gitlab-test::ruby], recipe[cookbook-gitlab-test::mysql]'
+)
+
+### Register your runner instance with a GitLab CI Coordinator
+sudo /opt/gitlab-runner/bin/setup -C /home/gitlab-runner
+
+# Restart the gitlab-runner Upstart script
+sudo service gitlab-runner restart
+```
diff --git a/doc/examples/configure_a_runner_to_run_the_gitlab_ce_test_suite.md b/doc/examples/configure_a_runner_to_run_the_gitlab_ce_test_suite.md
deleted file mode 100644
index 0ddab52..0000000
--- a/doc/examples/configure_a_runner_to_run_the_gitlab_ce_test_suite.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Configure a runner to run the GitLab CE test suite
-
-Please see
-[cookbook-gitlab-test](https://gitlab.com/gitlab-org/cookbook-gitlab-test/blob/master/README.md)
-for instructions how to prepare a server to run CI tests for GitLab. The actual
-[build script](build_script_gitlab_ce.md) is separate.