Skip to content
Snippets Groups Projects
Commit 056ab8977380 authored by Balasankar "Balu" C's avatar Balasankar "Balu" C
Browse files

Use Ohai from custom fork


Signed-off-by: default avatarBalasankar "Balu" C <balasankar@gitlab.com>
parent be5f264c0307
No related branches found
No related tags found
No related merge requests found
......@@ -115,3 +115,6 @@
consul:
remote: "git@dev.gitlab.org:omnibus-mirror/consul.git"
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/consul.git"
ohai:
remote: "git@dev.gitlab.org:omnibus-mirror/ohai.git"
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/ohai.git"
......@@ -3,6 +3,7 @@
require_relative "lib/gitlab/version"
omnibus_gem_version = Gitlab::Version.new('omnibus', "gitlab-omnibus-v5.6.12")
ohai_gem_version = Gitlab::Version.new('ohai', '14-8-13-gitlab')
# Note that omnibus is from a fork with additional gitlab changes. You can
# check what they are with the following comparison link:
......@@ -23,7 +24,7 @@
gem 'omnibus', git: omnibus_gem_version.remote, branch: omnibus_gem_version.print(false)
gem 'chef', '~> 14.13'
gem 'ohai'
gem 'ohai', git: ohai_gem_version.remote, branch: ohai_gem_version.print(false)
gem 'package_cloud'
gem 'rainbow', '~> 2.2' # This is used by gitlab-ctl and the chef formatter
gem 'thor', '0.18.1' # This specific version is required by package_cloud
......
GIT
remote: git@dev.gitlab.org:omnibus-mirror/ohai.git
revision: 60db53ef823748434efad64e2ffbd99ba760c453
branch: 14-8-13-gitlab
specs:
ohai (14.8.13)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
mixlib-cli (>= 1.7.0)
mixlib-config (>= 2.0, < 4.0)
mixlib-log (>= 2.0.1, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
GIT
remote: https://dev.gitlab.org/gitlab/omnibus.git
revision: 8c83c9dffaa433cb6d1456a7662238b7d8010d34
......@@ -885,18 +903,6 @@
netrc (0.11.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
ohai (14.8.12)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
mixlib-cli (>= 1.7.0)
mixlib-config (>= 2.0, < 4.0)
mixlib-log (>= 2.0.1, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
omnibus-ctl (0.3.6)
os (0.9.6)
package_cloud (0.3.04)
......@@ -1009,7 +1015,7 @@
http
json
knapsack
ohai
ohai!
omnibus!
omnibus-ctl (= 0.3.6)
package_cloud
......@@ -1023,4 +1029,4 @@
thor (= 0.18.1)
BUNDLED WITH
1.17.1
1.17.2
......@@ -14,6 +14,8 @@
# limitations under the License.
#
require "#{Omnibus::Config.project_root}/lib/gitlab/version"
name 'ohai'
# The version here should be in agreement with /Gemfile.lock so that our rspec
# testing stays consistent with the package contents.
......@@ -17,7 +19,10 @@
name 'ohai'
# The version here should be in agreement with /Gemfile.lock so that our rspec
# testing stays consistent with the package contents.
default_version '14.8.12'
version = Gitlab::Version.new('ohai', '14-8-13-gitlab')
default_version version.print(false)
source git: version.remote
license 'Apache-2.0'
license_file 'LICENSE'
......@@ -28,6 +33,5 @@
dependency 'rubygems'
build do
patch source: "license/add-license-file.patch"
env = with_standard_compiler_flags(with_embedded_path)
......@@ -32,3 +36,4 @@
env = with_standard_compiler_flags(with_embedded_path)
gem 'build ohai.gemspec'
gem 'install ohai' \
......@@ -34,3 +39,2 @@
gem 'install ohai' \
" --version '#{version}'" \
" --bindir '#{install_dir}/embedded/bin'" \
......@@ -36,3 +40,4 @@
" --bindir '#{install_dir}/embedded/bin'" \
' --no-document', env: env
' --no-document' \
" ohai-14.8.13.gem", env: env
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment