Skip to content

Commit

Permalink
bring rubygems & bundler to be consistent with embedded ruby version
Browse files Browse the repository at this point in the history 
The version of rubygems and bundler must be consistent witht the version
included in the embedded Ruby install or we'll get double-bundler
problems.

* versions overridden in the supermarket software definition
* BUNDLED WITH updated in the Gemfile.locks
* updated the omnibus and omnibus-software gems to have access to the
  new versions of components
* berkshelf installed as a gem instead of as an omnibus software
  dependency because it installs from git with bundler and its
  Gemfile.lock is an older version of bundler that does not match
  the one this change uses
* update the embedded chef-client to latest 14 - the ctl-reconfigure
  command provided by omnibus-ctl uses the --chef-license switch.
  Need to update to a version of 14 with that switch backported as
  a no-op or else supermarket-ctl reconfigure would fail with a message
  about an invalid option.

Signed-off-by: Robb Kidd <rkidd@chef.io>
  • Loading branch information
@robbkidd
robbkidd committed Mar 4, 2020
1 parent 16e5d99 commit e57a761
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 109 deletions.
228 changes: 126 additions & 102 deletions omnibus/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,52 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: e1779458769356ae6fed51fb7c3685829b6e2a5b
revision: 722d2a8b7f74b98ee44efadac6d74daa5559a48d
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
omnibus (>= 5.6.1)

GIT
remote: https://github.com/chef/omnibus.git
revision: c872e61c30d2b3f88ead03bd1254ff96d37059a3
revision: f38dcb57017e007c7e98a9934e881904a5e09907
specs:
omnibus (6.1.3)
omnibus (7.0.6)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
ffi-yajl (~> 2.2)
license_scout (~> 1.0)
mixlib-shellout (>= 2.0, < 4.0)
mixlib-versioning
ohai (>= 13, < 16)
pedump
ruby-progressbar (~> 1.7)
thor (~> 0.18)
thor (>= 0.18, < 2.0)

GEM
remote: https://rubygems.org/
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.5)
artifactory (3.0.12)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
aws-partitions (1.213.0)
aws-sdk-core (3.68.0)
aws-partitions (1.279.0)
aws-sdk-core (3.90.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.48.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-s3 (1.60.2)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-sigv4 (1.1.1)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt_pbkdf (1.0.1)
berkshelf (7.0.8)
berkshelf (7.0.9)
chef (>= 13.6.52)
chef-config
cleanroom (~> 1.0)
Expand All @@ -60,12 +59,30 @@ GEM
retryable (>= 2.0, < 4.0)
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.3)
chef (15.2.20)
builder (3.2.4)
celluloid (0.17.4)
celluloid-essentials
celluloid-extras
celluloid-fsm
celluloid-pool
celluloid-supervision
timers (>= 4.1.1)
celluloid-essentials (0.20.5)
timers (>= 4.1.1)
celluloid-extras (0.20.5)
timers (>= 4.1.1)
celluloid-fsm (0.20.5)
timers (>= 4.1.1)
celluloid-pool (0.20.5)
timers (>= 4.1.1)
celluloid-supervision (0.20.6)
timers (>= 4.1.1)
chef (15.8.23)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.2.20)
chef-config (= 15.8.23)
chef-utils (= 15.8.23)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand All @@ -77,94 +94,98 @@ GEM
iniparse (~> 1.4)
license-acceptance (~> 1.0, >= 1.0.5)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
mixlib-authentication (>= 2.1, < 4)
mixlib-cli (>= 2.1.1, < 3.0)
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 2.4, < 4.0)
mixlib-shellout (>= 3.0.3, < 4.0)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 4.2, < 6)
net-ssh-multi (~> 1.2, >= 1.2.1)
ohai (~> 15.0)
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
train-core (~> 2.0, >= 2.0.12)
train-core (~> 3.1)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
chef-config (15.2.20)
chef-cleanroom (1.0.2)
chef-config (15.8.23)
addressable
chef-utils (= 15.8.23)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.0.1)
chef-zero (14.0.12)
chef-sugar (5.1.9)
chef-utils (15.8.23)
chef-zero (15.0.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
hashie (>= 2.0, < 5.0)
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
citrus (3.0.2)
cleanroom (1.0.0)
concurrent-ruby (1.1.5)
coderay (1.1.2)
concurrent-ruby (1.1.6)
diff-lcs (1.3)
ed25519 (1.2.4)
equatable (0.6.1)
erubi (1.9.0)
erubis (2.7.0)
faraday (0.15.4)
faraday (1.0.0)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
ffi-libarchive (0.4.10)
ffi (1.12.2)
ffi-libarchive (1.0.0)
ffi (~> 1.0)
ffi-yajl (2.3.1)
ffi-yajl (2.3.3)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
gssapi (1.3.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.6.0)
hashie (4.1.0)
highline (1.7.10)
httpclient (2.8.3)
iniparse (1.4.4)
inifile (3.0.0)
iniparse (1.5.0)
iostruct (0.0.4)
ipaddress (0.8.3)
jmespath (1.4.0)
json (2.2.0)
kitchen-vagrant (1.6.0)
test-kitchen (>= 1.4, < 3)
json (2.3.0)
kitchen-vagrant (0.11.3)
test-kitchen (~> 1.0.0.beta)
libyajl2 (1.2.0)
license-acceptance (1.0.13)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
tty-prompt (~> 0.18)
license_scout (1.0.24)
license_scout (1.1.7)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
toml-rb (~> 1.0)
mixlib-shellout (>= 2.2, < 4.0)
toml-rb (>= 1, < 3)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
minitar (0.8)
mixlib-archive (1.0.1)
method_source (0.9.2)
minitar (0.9)
mixlib-archive (1.0.5)
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (2.1.1)
mixlib-config (3.0.1)
mixlib-authentication (3.0.6)
mixlib-cli (2.1.5)
mixlib-config (3.0.6)
tomlrb
mixlib-install (3.11.18)
mixlib-shellout
mixlib-versioning
thor
mixlib-log (3.0.1)
mixlib-shellout (2.4.4)
mixlib-versioning (1.2.7)
mixlib-log (3.0.8)
mixlib-shellout (3.0.9)
mixlib-versioning (1.2.12)
molinillo (0.6.6)
multi_json (1.13.1)
multipart-post (2.0.0)
necromancer (0.5.0)
multi_json (1.14.1)
multipart-post (2.1.1)
necromancer (0.5.1)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
Expand All @@ -176,9 +197,10 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
octokit (4.14.0)
octokit (4.16.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (15.3.1)
ohai (15.7.4)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand All @@ -193,96 +215,98 @@ GEM
pastel (0.7.3)
equatable (~> 0.6)
tty-color (~> 0.5)
pedump (0.5.2)
pedump (0.5.4)
awesome_print
iostruct (>= 0.0.4)
multipart-post (~> 2.0.0)
multipart-post (>= 2.0.0)
progressbar
rainbow
zhexdump (>= 0.0.2)
plist (3.5.0)
progressbar (1.10.1)
proxifier (1.0.3)
public_suffix (4.0.1)
rack (2.0.8)
retryable (3.0.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.3)
rack (2.2.2)
rainbow (3.0.0)
retryable (3.0.5)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
rubyzip (1.2.3)
rubyzip (2.2.0)
safe_yaml (0.9.7)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
semverse (3.0.0)
solve (4.0.2)
solve (4.0.3)
molinillo (~> 0.6)
semverse (>= 1.1, < 4.0)
strings (0.1.5)
strings (0.1.8)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.1.0)
strings-ansi (0.2.0)
syslog-logger (1.6.8)
systemu (2.6.5)
test-kitchen (2.2.5)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (>= 1.1, < 3.0)
net-ssh (>= 2.9, < 6.0)
net-ssh-gateway (>= 1.2, < 3.0)
thor (~> 0.19)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
thor (0.20.3)
toml-rb (1.1.2)
test-kitchen (1.0.0.beta.3)
celluloid
mixlib-shellout
net-scp
net-ssh
pry
safe_yaml (~> 0.9.5)
thor
thor (1.0.1)
timers (4.3.0)
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.8)
train-core (2.1.19)
tomlrb (1.2.9)
train-core (3.2.23)
addressable (~> 2.5)
inifile (~> 3.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
train-winrm (0.2.6)
winrm (~> 2.0)
winrm-fs (~> 1.0)
tty-box (0.4.0)
tty-box (0.5.0)
pastel (~> 0.7.2)
strings (~> 0.1.5)
strings (~> 0.1.6)
tty-cursor (~> 0.7)
tty-color (0.5.0)
tty-cursor (0.7.0)
tty-prompt (0.19.0)
tty-color (0.5.1)
tty-cursor (0.7.1)
tty-prompt (0.20.0)
necromancer (~> 0.5.0)
pastel (~> 0.7.0)
tty-reader (~> 0.6.0)
tty-reader (0.6.0)
tty-reader (~> 0.7.0)
tty-reader (0.7.0)
tty-cursor (~> 0.7)
tty-screen (~> 0.7)
wisper (~> 2.0.0)
tty-screen (0.7.0)
unicode-display_width (1.6.0)
tty-screen (0.7.1)
unicode-display_width (1.6.1)
unicode_utils (1.4.0)
uuidtools (2.1.5)
winrm (2.3.2)
winrm (2.3.4)
builder (>= 2.1.2)
erubis (~> 2.7)
erubi (~> 1.8)
gssapi (~> 1.2)
gyoku (~> 1.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0, >= 0.6.1)
winrm-elevated (1.1.1)
winrm (~> 2.0)
winrm-fs (~> 1.0)
winrm-fs (1.3.2)
erubis (~> 2.7)
winrm-fs (1.3.4)
erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
rubyzip (~> 2.0)
winrm (~> 2.0)
wisper (2.0.0)
wmi-lite (1.0.2)
wisper (2.0.1)
wmi-lite (1.0.5)
zhexdump (0.0.2)

PLATFORMS
Expand All @@ -297,4 +321,4 @@ DEPENDENCIES
test-kitchen

BUNDLED WITH
1.17.3
2.1.2
Loading

0 comments on commit e57a761

Please sign in to comment.