Merge branch 'gitlab_omnibus_fork' into 'master'

Use omnibus fork

Switch to fork of omnibus project.

Use `gitlab_omnibus` branch which is created out of tag omnibus tag v4.0.0. This branch now also contains a fix for building RPI2 pacakges. Having a separate branch will allow us to pick the fixes and upgrade faster.

See merge request !358

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'omnibus'
+gem 'omnibus', git: 'https://gitlab.com/gitlab-org/omnibus.git', branch: 'gitlab_omnibus'
 gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'
 gem 'ohai'
 gem 'package_cloud'

Gemfile.lock

@@ -5,6 +5,19 @@ GIT
   specs:
     omnibus-software (4.0.0)
 
+GIT
+  remote: https://gitlab.com/gitlab-org/omnibus.git
+  revision: c009e40aeb5e87116255386ab454ebf35bcfd496
+  branch: gitlab_omnibus
+  specs:
+    omnibus (4.0.0)
+      chef-sugar (~> 2.2)
+      cleanroom (~> 1.0)
+      mixlib-shellout (~> 1.4)
+      ohai (~> 7.2)
+      thor (~> 0.18)
+      uber-s3
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -36,13 +49,6 @@ GEM
       mixlib-shellout (~> 1.2)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    omnibus (4.0.0)
-      chef-sugar (~> 2.2)
-      cleanroom (~> 1.0)
-      mixlib-shellout (~> 1.4)
-      ohai (~> 7.2)
-      thor (~> 0.18)
-      uber-s3
     package_cloud (0.2.18)
       colorize (= 0.6.0)
       highline (= 1.6.20)
@@ -63,7 +69,7 @@ PLATFORMS
 DEPENDENCIES
   json
   ohai
-  omnibus
+  omnibus!
   omnibus-software!
   package_cloud
   thor (= 0.18.1)

Makefile

@@ -24,6 +24,10 @@ do_release: no_changes on_tag purge build move_to_platform_dir sync packagecloud
 test: RELEASE_BUCKET=omnibus-builds
 test: no_changes purge test_build move_to_platform_dir sync
 
+# Redefine PLATFORM_DIR for Raspberry Pi 2 packages. Do not sync to packagecloud
+do_rpi2_release: PLATFORM_DIR=raspberry-pi
+do_rpi2_release: no_changes purge test_build move_to_platform_dir sync
+
 no_changes:
 	git diff --quiet HEAD
 

README.md

@@ -18,6 +18,10 @@ stable branch (example shown below).
 
 ![documentation version](doc/images/omnibus-documentation-version.png)
 
+## Omnibus fork
+
+Omnibus GitLab is using a fork of [omnibus project](https://github.com/chef/omnibus). Fork is located at [gitlab.com](https://gitlab.com/gitlab-org/omnibus).
+
 ## GitLab CI
 
 To setup GitLab CI please see the [separate GitLab CI