summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@chef.io>2020-04-03 17:32:21 -0400
committerGitHub <noreply@github.com>2020-04-03 17:32:21 -0400
commit3b353e456a7d720e51fe5f12474e2c208030311c (patch)
treeaaa5604b161d00b6902f61969a684b6ae94c7b2f
parenta5d7a9893a0a1af5d0310c4ad9febb8dde46ca93 (diff)
parent9c1d7044efecf129e58596d892bbb2fa793d779a (diff)
downloadchef-3b353e456a7d720e51fe5f12474e2c208030311c.tar.gz
Merge pull request #9589 from chef/btm/14-bump-bundle-conservative
14: Conservative bump of omnibus/Gemfile
-rw-r--r--.expeditor/verify.pipeline.yml2
-rw-r--r--Gemfile.lock8
-rw-r--r--kitchen-tests/kitchen.yml5
-rw-r--r--omnibus/Gemfile.lock10
-rwxr-xr-xscripts/bk_tests/bk_win_functional.ps18
-rw-r--r--spec/integration/client/client_spec.rb16
6 files changed, 18 insertions, 31 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 09375afde8..d47e3a32c1 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -298,7 +298,7 @@ steps:
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- bundle install --jobs=3 --retry=3 --without omnibus_package docgen
- - bundle exec tasks/bin/run_external_test chef/knife-windows master rake unit_spec
+ - bundle exec tasks/bin/run_external_test chef/knife-windows master rake spec
expeditor:
executor:
docker:
diff --git a/Gemfile.lock b/Gemfile.lock
index 6cdb36e0c3..957e07f29c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,9 +121,9 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.12.1)
- ffi (1.12.1-x64-mingw32)
- ffi (1.12.1-x86-mingw32)
+ ffi (1.12.2)
+ ffi (1.12.2-x64-mingw32)
+ ffi (1.12.2-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.3)
@@ -235,7 +235,7 @@ GEM
rspec-mocks (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
- rspec-expectations (3.9.0)
+ rspec-expectations (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-its (1.3.0)
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 561f3d71eb..c737639405 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -21,7 +21,8 @@ lifecycle:
- remote: /opt/chef/embedded/bin/gem uninstall -x chef-bin # appbundle-updater doesn't remove this when downgrading to 14
- remote: /opt/chef/embedded/bin/rake --version
- remote: /opt/chef/embedded/bin/bundle -v
- - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
+ - remote: /opt/chef/embedded/bin/gem install appbundle-updater -v "< 1.0" --no-doc # 1.0 has fixed strings related to chef-bin
+ - remote: /opt/chef/embedded/bin/gem install appbundler --no-doc
- remote: /opt/chef/embedded/bin/appbundle-updater chef ohai <%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %> --tarball --github chef/ohai
- remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT'] || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef
- remote: echo "Installed Chef / Ohai release:"
@@ -73,6 +74,7 @@ platforms:
image: dokken/centos-6
pid_one_command: /sbin/init
intermediate_instructions:
+ - RUN yum install -y libffi-devel
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
- name: centos-7
@@ -96,6 +98,7 @@ platforms:
image: dokken/oraclelinux-6
pid_one_command: /sbin/init
intermediate_instructions:
+ - RUN yum install -y libffi-devel
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
- name: oraclelinux-7
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 43d7e3602f..cd1b466acc 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 70855aab656d333622c51171828b4f41d04f6ef5
+ revision: f389917504c20839ff9607df63fb2e59e2c31b52
branch: master
specs:
- omnibus (6.1.21)
+ omnibus (7.0.7)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: ebdd701bcf29f76ba7f1bbfc5e338b7c19287133
+ revision: 1b490aa4e6a5b224d98d07d72cdf90cb2f132576
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.12)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.292.0)
+ aws-partitions (1.293.0)
aws-sdk-core (3.92.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -177,7 +177,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (4.1.0)
+ hashie (3.6.0)
highline (1.7.10)
httpclient (2.8.3)
iniparse (1.5.0)
diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1
index bd262fed9c..12bb72c9ba 100755
--- a/scripts/bk_tests/bk_win_functional.ps1
+++ b/scripts/bk_tests/bk_win_functional.ps1
@@ -9,13 +9,13 @@ echo "--- install ruby + devkit"
$ErrorActionPreference = 'Stop'
echo "Downloading Ruby + DevKit"
-aws s3 cp s3://public-cd-buildkite-cache/rubyinstaller-devkit-2.6.5-1-x64.exe c:/rubyinstaller-devkit-2.6.5-1-x64.exe
+aws s3 cp s3://public-cd-buildkite-cache/rubyinstaller-devkit-2.6.5-1-x64.exe $env:temp/rubyinstaller-devkit-2.6.5-1-x64.exe
echo "Installing Ruby + DevKit"
-Start-Process c:\rubyinstaller-devkit-2.6.5-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait
+Start-Process $env:temp\rubyinstaller-devkit-2.6.5-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait
echo "Cleaning up installation"
-Remove-Item c:\rubyinstaller-devkit-2.6.5-1-x64.exe -Force
+Remove-Item $env:temp\rubyinstaller-devkit-2.6.5-1-x64.exe -Force
echo "Closing out the layer (this can take awhile)"
# Set-Item -Path Env:Path -Value to include ruby26
@@ -33,4 +33,4 @@ bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
echo "+++ bundle exec rake spec:functional"
bundle exec rake spec:functional
-exit $LASTEXITCODE \ No newline at end of file
+exit $LASTEXITCODE
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index d0041de054..f026559ee7 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -60,22 +60,6 @@ describe "chef-client" do
shell_out!("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'", cwd: chef_dir)
end
- it "should complete successfully with no other environment variables", skip: (Chef::Platform.windows?) do
- file "config/client.rb", <<~EOM
- local_mode true
- cookbook_path "#{path_to("cookbooks")}"
- EOM
-
- begin
- result = shell_out("env -i #{critical_env_vars} #{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'", cwd: chef_dir)
- result.error!
- rescue
- Chef::Log.info "Bare invocation will have the following load-path."
- Chef::Log.info shell_out!("env -i #{critical_env_vars} ruby -e 'puts $:'").stdout
- raise
- end
- end
-
it "should complete successfully with --no-listen" do
file "config/client.rb", <<~EOM
local_mode true