Revert omnibus to v8fix-chef-17

Signed-off-by: Gregory Schofield <grschofi@progress.com>

2 files changed, 33 insertions, 34 deletions

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index ca5e4f2339..597f939f30 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,9 +1,9 @@
 source "https://rubygems.org"
 
-gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main")
-gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main")
+gem "omnibus", "~> 8"
+gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), tag: "22.5.186"
 gem "artifactory"
-
+gem "rexml", "~> 3.2"
 gem "pedump"
 
 # This development group is installed by default when you run `bundle install`,
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4210d718b3..73f43bb326 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,30 +1,10 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: a63bd71702f5bf350ca17ee0726ac36fc418d54e
-  branch: main
+  revision: 6e9c0ef037e9450303756e05e7888aaea2448c64
+  tag: 22.5.186
   specs:
     omnibus-software (4.0.0)
-      omnibus (>= 9.0.0)
-
-GIT
-  remote: https://github.com/chef/omnibus.git
-  revision: 5bc091ab3ed4ab002ef85dad3923914c25bb3dcd
-  branch: main
-  specs:
-    omnibus (9.0.8)
-      aws-sdk-s3 (~> 1)
-      chef-cleanroom (~> 1.0)
-      chef-utils (>= 15.4)
-      contracts (>= 0.16.0, < 0.17.0)
-      ffi-yajl (~> 2.2)
-      license_scout (~> 1.0)
-      mixlib-shellout (>= 2.0, < 4.0)
-      mixlib-versioning
-      ohai (>= 15, < 18)
-      pedump
-      rexml (~> 3.2)
-      ruby-progressbar (~> 1.7)
-      thor (>= 0.18, < 2.0)
+      omnibus (>= 8.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -53,7 +33,7 @@ GEM
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0)
-    berkshelf (8.0.1)
+    berkshelf (8.0.5)
       chef (>= 15.7.32)
       chef-config
       cleanroom (~> 1.0)
@@ -238,7 +218,7 @@ GEM
     iso8601 (0.13.0)
     jmespath (1.6.1)
     json (2.6.2)
-    kitchen-vagrant (1.11.0)
+    kitchen-vagrant (1.13.0)
       test-kitchen (>= 1.4, < 4)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -246,7 +226,7 @@ GEM
       tomlrb (>= 1.2, < 3.0)
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
-    license_scout (1.3.2)
+    license_scout (1.3.3)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
@@ -276,6 +256,11 @@ GEM
       ffi-win32-extensions (~> 1.0.3)
       win32-process (~> 0.9)
       wmi-lite (~> 1.0)
+    mixlib-shellout (3.2.7-x64-mingw-ucrt)
+      chef-utils
+      ffi-win32-extensions (~> 1.0.3)
+      win32-process (~> 0.9)
+      wmi-lite (~> 1.0)
     mixlib-versioning (1.2.12)
     molinillo (0.8.0)
     multi_json (1.15.0)
@@ -304,6 +289,19 @@ GEM
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
+    omnibus (8.3.2)
+      aws-sdk-s3 (~> 1)
+      chef-cleanroom (~> 1.0)
+      chef-utils (>= 15.4)
+      contracts (>= 0.16.0, < 0.17.0)
+      ffi-yajl (~> 2.2)
+      license_scout (~> 1.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      mixlib-versioning
+      ohai (>= 15, < 18)
+      pedump
+      ruby-progressbar (~> 1.7)
+      thor (>= 0.18, < 2.0)
     parallel (1.22.1)
     parslet (1.8.2)
     pastel (0.8.0)
@@ -359,15 +357,15 @@ GEM
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    test-kitchen (3.2.2)
+    test-kitchen (3.5.0)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
-      net-scp (>= 1.1, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
+      net-scp (>= 1.1, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
       net-ssh-gateway (>= 1.2, < 3.0)
       thor (>= 0.19, < 2.0)
       winrm (~> 2.0)
@@ -466,11 +464,12 @@ DEPENDENCIES
   artifactory
   berkshelf (>= 7.0)
   kitchen-vagrant (>= 1.3.1)
-  omnibus!
+  omnibus (~> 8)
   omnibus-software!
   pedump
+  rexml (~> 3.2)
   test-kitchen (>= 1.23)
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   2.3.5
+   2.3.7