From 20c62879d26a57eb10d6be5a4f2aab24ce0df9dc Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Tue, 19 Jan 2021 19:28:41 -0800
Subject: adhoc test

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 omnibus/Gemfile      |  4 ++--
 omnibus/Gemfile.lock | 10 +++++-----
 omnibus_overrides.rb |  9 ---------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index df94943a3d..dfc818b430 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/remove-ohai-dep"
 gem "artifactory"
 
 gem "pedump"
@@ -21,4 +21,4 @@ group :development do
   gem "test-kitchen", ">= 1.23"
   gem "kitchen-vagrant", ">= 1.3.1"
   gem "winrm-fs", "~> 1.0"
-end
\ No newline at end of file
+end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f3091f71eb..290b0b1ccc 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,8 +18,8 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 023e6bf1221e9ab92a6809c9f04f55973178f0b1
-  branch: master
+  revision: e44d2ec8f1593bc8495771fd92405f188163d07b
+  branch: lcg/remove-ohai-dep
   specs:
     omnibus-software (4.0.0)
       omnibus (>= 8.0.0)
@@ -32,8 +32,8 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.416.0)
-    aws-sdk-core (3.111.1)
+    aws-partitions (1.417.0)
+    aws-sdk-core (3.111.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -333,7 +333,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     rubyntlm (0.6.2)
     rubyzip (2.3.0)
     sawyer (0.8.2)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 008614bdeb..473df934f6 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -13,7 +13,6 @@ override "libxslt", version: "1.1.34"
 override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
-override "nokogiri", version: "1.11.0"
 override "openssl", version: "1.0.2x"
 override "pkg-config-lite", version: "0.28-1"
 override "ruby", version: "2.7.2"
@@ -21,11 +20,3 @@ override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.11"
-
-# We build both chef and ohai omnibus-software definitions which creates the
-# chef-client and ohai binstubs. Out of the box the ohai definition uses whatever
-# is in master, which won't match what's in the Gemfile.lock and used by the chef
-# definition. This pin will ensure that ohai and chef-client commands use the
-# same (released) version of ohai.
-gemfile_lock = File.join(File.expand_path(__dir__), "Gemfile.lock")
-override "ohai", version: "#{::File.readlines(gemfile_lock).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; "v" + $1}" # rubocop: disable Layout/SpaceInsideStringInterpolation
-- 
cgit v1.2.1