summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-09-28 10:56:15 +0600
committerJohn McCrae <john.mccrae@progress.com>2022-09-28 10:56:15 +0600
commit30d13fa79e24d019c5fb42dcff2534fe76eb5c5e (patch)
tree71b494c6c93f275793956cf1ec4731d89b68859b
parentdd982bc5014498fe21b03de5d41f881f7a2bbcdb (diff)
downloadchef-30d13fa79e24d019c5fb42dcff2534fe76eb5c5e.tar.gz
testing a build with updated gems AND the whitelist changesjfm/test_build
Signed-off-by: John McCrae <john.mccrae@progress.com>
-rw-r--r--Gemfile.lock109
-rw-r--r--omnibus/Gemfile3
-rw-r--r--omnibus/Gemfile.lock28
3 files changed, 32 insertions, 108 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e1d917dade..f108765e1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/ohai.git
- revision: 89e6a08889f414efabc53a1c15c418baddc5cd2d
+ revision: 3855db320bf14766e37eaeb1bb61ba87c2542ac8
branch: main
specs:
- ohai (18.0.20)
+ ohai (18.0.24)
chef-config (>= 14.12, < 19)
chef-utils (>= 16.0, < 19)
ffi (~> 1.9)
@@ -35,13 +35,6 @@ GIT
netrc (~> 0.8)
GIT
- remote: https://github.com/chef/ruby-shadow
- revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c
- branch: lcg/ruby-3.0
- specs:
- ruby-shadow (2.5.0)
-
-GIT
remote: https://github.com/chef/ruby-proxifier
revision: 8b87d0b5b469adbd93eabc0d20f3e47007aef743
branch: lcg/ruby-3
@@ -85,52 +78,6 @@ PATH
unf_ext (>= 0.0.8.2)
uuidtools (>= 2.1.5, < 3.0)
vault (~> 0.16)
- chef (18.0.152-x64-mingw-ucrt)
- addressable
- aws-sdk-s3 (~> 1.91)
- aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 18.0.152)
- chef-powershell (~> 1.0.12)
- chef-utils (= 18.0.152)
- chef-vault
- chef-zero (>= 14.0.11)
- corefoundation (~> 0.3.4)
- diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
- erubis (~> 2.7)
- ffi (>= 1.15.5)
- ffi-libarchive (~> 1.0, >= 1.0.3)
- ffi-yajl (~> 2.2)
- iniparse (~> 1.4)
- inspec-core (>= 5)
- iso8601 (>= 0.12.1, < 0.14)
- 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-ftp
- net-sftp (>= 2.1.2, < 4.0)
- ohai (~> 18.0)
- plist (~> 3.2)
- proxifier (~> 1.0)
- syslog-logger (~> 1.6)
- train-core (~> 3.10, >= 3.2.28)
- train-rest (>= 0.4.1)
- train-winrm (>= 0.2.5)
- unf_ext (>= 0.0.8.2)
- uuidtools (>= 2.1.5, < 3.0)
- vault (~> 0.16)
- win32-api (~> 1.10.0)
- win32-certstore (~> 0.6.15)
- 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)
PATH
remote: chef-bin
@@ -158,15 +105,15 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
appbundler (0.13.4)
mixlib-cli (>= 1.4, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.627.0)
- aws-sdk-core (3.143.0)
+ aws-partitions (1.638.0)
+ aws-sdk-core (3.156.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -187,9 +134,6 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
- chef-powershell (1.0.13)
- ffi (~> 1.15)
- ffi-yajl (~> 2.4)
chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
@@ -285,7 +229,6 @@ GEM
inspec-core-bin (5.18.14)
inspec-core (= 5.18.14)
ipaddress (0.8.3)
- iso8601 (0.13.0)
jmespath (1.6.1)
json (2.6.2)
libyajl2 (2.1.0)
@@ -304,6 +247,8 @@ GEM
mime-types-data (3.2022.0105)
mixlib-archive (1.1.7)
mixlib-log
+ mixlib-archive (1.1.7-universal-mingw32)
+ mixlib-log
mixlib-authentication (3.0.10)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
@@ -340,18 +285,18 @@ GEM
pry (0.13.0)
coderay (~> 1.1)
method_source (~> 1.0)
- pry-byebug (3.9.0)
+ pry-byebug (3.10.1)
byebug (~> 11.0)
- pry (~> 0.13.0)
+ pry (>= 0.13, < 0.15)
pry-stack_explorer (0.6.1)
binding_of_caller (~> 1.0)
pry (~> 0.13)
- public_suffix (4.0.7)
+ public_suffix (5.0.0)
rack (2.2.4)
rainbow (3.1.1)
rake (13.0.6)
rb-readline (0.5.5)
- regexp_parser (2.5.0)
+ regexp_parser (2.6.0)
rexml (3.2.5)
rspec (3.11.0)
rspec-core (~> 3.11.0)
@@ -359,7 +304,7 @@ GEM
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
- rspec-expectations (3.11.0)
+ rspec-expectations (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-its (1.3.0)
@@ -368,7 +313,7 @@ GEM
rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
- rspec-support (3.11.0)
+ rspec-support (3.11.1)
rubocop (1.25.1)
parallel (~> 1.10)
parser (>= 3.1.0.0)
@@ -391,7 +336,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)
thor (1.2.1)
time (0.2.0)
@@ -435,38 +379,18 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unf_ext (0.0.8.2-x64-mingw-ucrt)
- unicode-display_width (2.2.0)
+ unicode-display_width (2.3.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
vault (0.17.0)
aws-sigv4
- webmock (3.17.1)
+ webmock (3.18.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
- win32-api (1.10.1)
- win32-certstore (0.6.15)
- chef-powershell (>= 1.0.12)
- ffi
- 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.10.0)
ffi (>= 1.0.0)
- win32-service (2.3.2)
- ffi
- ffi-win32-extensions
- win32-taskscheduler (2.0.4)
- ffi
- structured_warnings
winrm (2.3.6)
builder (>= 2.1.2)
erubi (~> 1.8)
@@ -514,7 +438,6 @@ DEPENDENCIES
rb-readline
rest-client!
rspec
- ruby-shadow!
webmock
BUNDLED WITH
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index a8d16ac939..c6589d956b 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,6 +1,7 @@
source "https://rubygems.org"
-gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main")
+# gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main")
+gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "praj/INFC-268/whitelist_solaris_libs")
gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main")
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 7d0e73c12c..b14b92bf34 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus.git
- revision: 5b41f817c386d598c57652f1e1340ea312ed487d
- branch: main
+ revision: 0dbab02e77d8c4ada0ecb43c0c7ce104dd4481699
+ branch: praj/INFC-268/whitelist_solaris_libs
specs:
omnibus (9.0.6)
aws-sdk-s3 (~> 1)
@@ -29,13 +29,13 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
- aws-partitions (1.610.0)
- aws-sdk-core (3.131.3)
+ aws-partitions (1.638.0)
+ aws-sdk-core (3.156.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -47,7 +47,7 @@ GEM
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
- aws-sdk-secretsmanager (1.64.0)
+ aws-sdk-secretsmanager (1.65.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.1)
@@ -174,7 +174,7 @@ GEM
ffi (>= 1.15.0)
diff-lcs (1.5.0)
ed25519 (1.3.0)
- erubi (1.10.0)
+ erubi (1.11.0)
erubis (2.7.0)
faraday (1.4.3)
faraday-em_http (~> 1.0)
@@ -264,7 +264,7 @@ GEM
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
- mixlib-install (3.12.19)
+ mixlib-install (3.12.20)
mixlib-shellout
mixlib-versioning
thor
@@ -324,7 +324,7 @@ GEM
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
- public_suffix (4.0.7)
+ public_suffix (5.0.0)
rack (2.2.4)
rainbow (3.1.1)
retryable (3.0.5)
@@ -335,7 +335,7 @@ GEM
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
- rspec-expectations (3.11.0)
+ rspec-expectations (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-its (1.3.0)
@@ -344,7 +344,7 @@ GEM
rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
- rspec-support (3.11.0)
+ rspec-support (3.11.1)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
@@ -364,7 +364,7 @@ GEM
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (3.3.1)
+ test-kitchen (3.3.2)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
@@ -411,7 +411,7 @@ GEM
pastel (~> 0.8)
strings (~> 0.2.0)
tty-screen (~> 0.8)
- unicode-display_width (2.2.0)
+ unicode-display_width (2.3.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
vault (0.17.0)