WIP

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

4 files changed, 30 insertions, 92 deletions

diff --git a/Rakefile b/Rakefile
index 2500c93ea0..d3a8aebf44 100644
--- a/Rakefile
+++ b/Rakefile
@@ -74,6 +74,17 @@ task :install do
   end
 end
 
+namespace :install do
+  task local: "pre_install:all"
+
+  task :local do
+    chef_bin_path = ::File.join(::File.dirname(__FILE__), "chef-bin")
+    Dir.chdir(chef_bin_path) do
+      sh("rake install:local")
+    end
+  end
+end
+
 task :pedant, :chef_zero_spec
 
 task :build_eventlog do
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index e34b4e1ab1..59ca83727f 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", path: "../../omnibus-software"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/ruby-3.0"
 gem "artifactory"
 
 gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 66f7b12462..e322b71034 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,11 +18,8 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 1769ef260837e73a3a865f1fa3e02ef2e0aa394c
-  specs:
-
-PATH
-  remote: ../../omnibus-software
+  revision: f1a0af8d7350a061207dae8c389cb0c2b19a2789
+  branch: lcg/ruby-3.0
   specs:
     omnibus-software (4.0.0)
       omnibus (>= 8.0.0)
@@ -35,7 +32,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.1.1)
-    aws-partitions (1.434.0)
+    aws-partitions (1.435.0)
     aws-sdk-core (3.113.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -44,7 +41,7 @@ GEM
     aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.92.0)
+    aws-sdk-s3 (1.93.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -67,61 +64,22 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (16.11.7)
-      addressable
-      bcrypt_pbkdf (~> 1.1)
-      bundler (>= 1.10)
-      chef-config (= 16.11.7)
-      chef-utils (= 16.11.7)
-      chef-vault
-      chef-zero (>= 14.0.11)
-      diff-lcs (>= 1.2.4, < 1.4.0)
-      ed25519 (~> 1.2)
-      erubis (~> 2.7)
-      ffi (>= 1.9.25)
-      ffi-libarchive (~> 1.0, >= 1.0.3)
-      ffi-yajl (~> 2.2)
-      highline (>= 1.6.9, < 3)
-      iniparse (~> 1.4)
-      inspec-core (~> 4.23)
-      license-acceptance (>= 1.0.5, < 3)
-      mixlib-archive (>= 0.4, < 2.0)
-      mixlib-authentication (>= 2.1, < 4)
-      mixlib-cli (>= 2.1.1, < 3.0)
-      mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.1.1, < 4.0)
-      net-sftp (>= 2.1.2, < 4.0)
-      net-ssh (>= 5.1, < 7)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 16.0)
-      pastel
-      plist (~> 3.2)
-      proxifier (~> 1.0)
-      syslog-logger (~> 1.6)
-      train-core (~> 3.2, >= 3.2.28)
-      train-winrm (>= 0.2.5)
-      tty-prompt (~> 0.21)
-      tty-screen (~> 0.6)
-      tty-table (~> 0.11)
-      uuidtools (>= 2.1.5, < 3.0)
-    chef (16.11.7-universal-mingw32)
+    chef (17.0.172)
       addressable
       bcrypt_pbkdf (~> 1.1)
-      bundler (>= 1.10)
-      chef-config (= 16.11.7)
-      chef-utils (= 16.11.7)
+      chef-config (= 17.0.172)
+      chef-utils (= 17.0.172)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
       ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (>= 1.9.25)
+      ffi (>= 1.5.0)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
       inspec-core (~> 4.23)
-      iso8601 (>= 0.12.1, < 0.14)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
@@ -131,7 +89,7 @@ GEM
       net-sftp (>= 2.1.2, < 4.0)
       net-ssh (>= 5.1, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 16.0)
+      ohai (~> 17.0)
       pastel
       plist (~> 3.2)
       proxifier (~> 1.0)
@@ -142,20 +100,10 @@ GEM
       tty-screen (~> 0.6)
       tty-table (~> 0.11)
       uuidtools (>= 2.1.5, < 3.0)
-      win32-api (~> 1.5.3)
-      win32-certstore (~> 0.5.0)
-      win32-event (~> 0.6.1)
-      win32-eventlog (= 0.6.3)
-      win32-mmap (~> 0.4.1)
-      win32-mutex (~> 0.4.2)
-      win32-process (~> 0.9)
-      win32-service (>= 2.1.5, < 3.0)
-      win32-taskscheduler (~> 2.0)
-      wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (16.11.7)
+    chef-config (17.0.172)
       addressable
-      chef-utils (= 16.11.7)
+      chef-utils (= 17.0.172)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -163,7 +111,7 @@ GEM
     chef-telemetry (1.0.29)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (16.11.7)
+    chef-utils (17.0.172)
     chef-vault (4.1.0)
     chef-zero (15.0.4)
       ffi-yajl (~> 2.2)
@@ -205,7 +153,7 @@ GEM
     highline (2.0.3)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.28.0)
+    inspec-core (4.29.3)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0)
       faraday (>= 0.9.0, < 1.4)
@@ -230,7 +178,6 @@ GEM
       tty-table (~> 0.10)
     iostruct (0.0.4)
     ipaddress (0.8.3)
-    iso8601 (0.13.0)
     jmespath (1.4.0)
     json (2.5.1)
     kitchen-vagrant (1.8.0)
@@ -289,9 +236,9 @@ GEM
     octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (16.10.7)
-      chef-config (>= 12.8, < 17)
-      chef-utils (>= 16.0, < 17)
+    ohai (17.0.30)
+      chef-config (>= 12.8, < 18)
+      chef-utils (>= 16.0, < 18)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -354,7 +301,6 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    structured_warnings (0.4.0)
     syslog-logger (1.6.8)
     test-kitchen (2.11.2)
       bcrypt_pbkdf (~> 1.0)
@@ -407,28 +353,8 @@ GEM
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
     webrick (1.7.0)
-    win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.5.3)
-      ffi
-      mixlib-shellout
-    win32-event (0.6.3)
-      win32-ipc (>= 0.6.0)
-    win32-eventlog (0.6.3)
-      ffi
-    win32-ipc (0.7.0)
-      ffi
-    win32-mmap (0.4.2)
-      ffi
-    win32-mutex (0.4.3)
-      win32-ipc (>= 0.6.0)
     win32-process (0.9.0)
       ffi (>= 1.0.0)
-    win32-service (2.2.0)
-      ffi
-      ffi-win32-extensions
-    win32-taskscheduler (2.0.4)
-      ffi
-      structured_warnings
     winrm (2.3.6)
       builder (>= 2.1.2)
       erubi (~> 1.8)
@@ -468,4 +394,4 @@ DEPENDENCIES
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.3
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 182dcdc83e..7f843ab9d7 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -16,6 +16,7 @@ override "ncurses", version: "5.9"
 override "nokogiri", version: "1.11.0"
 override "openssl", version: mac_os_x? ? "1.1.1j" : "1.0.2y"
 override "pkg-config-lite", version: "0.28-1"
+override "bundler", version: "2.2.15"
 override "ruby", version: "3.0.0"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"