summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorswati keshari <swatikeshari4@gmail.com>2021-09-07 16:02:40 +0530
committerswati keshari <swatikeshari4@gmail.com>2021-09-07 16:06:20 +0530
commitf6753a7ff650db84fe0105ac167ab46f2766d3d6 (patch)
treec58c9578cf8507db9119f8ad1c1901b8e27b122a
parent8000aafc1824d2b2ebd5662118f0a11ebef8f11f (diff)
downloadchef-skeshari/Fix_build_failure.tar.gz
Replace deprecated --without flag with bundle configskeshari/Fix_build_failure
Signed-off-by: swati keshari <swatikeshari4@gmail.com>
-rw-r--r--.expeditor/verify.pipeline.yml66
-rw-r--r--scripts/bk_tests/bk_run_choco.ps13
-rw-r--r--scripts/bk_tests/bk_win_functional.ps13
-rw-r--r--scripts/bk_tests/bk_win_integration.ps13
-rw-r--r--scripts/bk_tests/bk_win_unit.ps13
5 files changed, 52 insertions, 26 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index aaeca2ac92..2fb6f78e4c 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -18,7 +18,8 @@ steps:
- label: "Integration Specs Ubuntu :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - cd /workdir; bundle config set --local without omnibus_package docgen
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
executor:
@@ -31,7 +32,8 @@ steps:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- apt-get update -y
- apt-get install -y cron locales # needed for functional tests to pass
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle config set --local without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
executor:
@@ -42,7 +44,8 @@ steps:
- label: "Unit Specs Ubuntu :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - bundle config set --local without omnibus_package docgen ruby_prof
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
expeditor:
@@ -53,7 +56,8 @@ steps:
- label: "Integration Specs CentOS :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - cd /workdir; bundle config set --local without omnibus_package docgen
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
executor:
@@ -65,7 +69,8 @@ steps:
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- yum install -y crontabs e2fsprogs util-linux
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle config set --local without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
executor:
@@ -76,7 +81,8 @@ steps:
- label: "Unit Specs CentOS :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - bundle config set --local without omnibus_package docgen ruby_prof
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
expeditor:
@@ -88,7 +94,8 @@ steps:
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- zypper install -y cron insserv-compat
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - cd /workdir; bundle config set --local without omnibus_package docgen
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
executor:
@@ -100,7 +107,8 @@ steps:
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- zypper install -y cronie insserv-compat
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle config set --local without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
executor:
@@ -111,7 +119,8 @@ steps:
- label: "Unit Specs openSUSE :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - bundle config set --local without omnibus_package docgen ruby_prof
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
expeditor:
@@ -122,7 +131,8 @@ steps:
- label: "Integration Specs Fedora :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - cd /workdir; bundle config set --local without omnibus_package docgen
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
executor:
@@ -134,7 +144,8 @@ steps:
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- yum install -y crontabs e2fsprogs util-linux
- - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle config set --local without omnibus_package docgen ruby_prof
+ - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
executor:
@@ -148,7 +159,8 @@ steps:
- label: "Unit Specs Fedora :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - bundle config set --local without omnibus_package docgen ruby_prof
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
expeditor:
@@ -205,7 +217,8 @@ steps:
- label: "Chefstyle :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen ruby_prof
+ - bundle config set --local without omnibus_package docgen ruby_prof
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake style
expeditor:
executor:
@@ -219,7 +232,8 @@ steps:
- label: "Integration Specs :ruby: 2.5"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
executor:
@@ -232,7 +246,8 @@ steps:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- apt-get update -y
- apt-get install -y cron locales net-tools # needed for functional tests to pass
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
executor:
@@ -243,7 +258,8 @@ steps:
- label: "Unit Specs :ruby: 2.5"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
expeditor:
@@ -258,7 +274,8 @@ steps:
- label: "chef-sugar gem :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chef/chef-sugar master rake
expeditor:
executor:
@@ -268,7 +285,8 @@ steps:
- label: "chef-zero gem :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chef/chef-zero master rake pedant
expeditor:
executor:
@@ -281,7 +299,8 @@ steps:
- label: "cheffish gem :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chef/cheffish master rake spec
expeditor:
executor:
@@ -291,7 +310,8 @@ steps:
- label: "chefspec gem :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chefspec/chefspec master rake
expeditor:
executor:
@@ -301,7 +321,8 @@ steps:
- label: "knife-windows gem :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chef/knife-windows master rake spec
expeditor:
executor:
@@ -314,7 +335,8 @@ steps:
- apt-get update -y
- apt-get install -y graphviz
- gem install bundler -v 1.17.3 # necessary for berks Gemfile.lock for now
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen
+ - bundle config set --local without omnibus_package docgen
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test berkshelf/berkshelf master rake
expeditor:
executor:
diff --git a/scripts/bk_tests/bk_run_choco.ps1 b/scripts/bk_tests/bk_run_choco.ps1
index 1d4b87a73a..7453788459 100644
--- a/scripts/bk_tests/bk_run_choco.ps1
+++ b/scripts/bk_tests/bk_run_choco.ps1
@@ -7,7 +7,8 @@ ruby -v
bundle --version
echo "--- bundle install"
-bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+bundle config set --local without omnibus_package docgen chefstyle
+bundle install --jobs=3 --retry=3
echo "+++ bundle exec rspec chocolatey_package_spec"
bundle exec rspec spec/functional/resource/chocolatey_package_spec.rb
diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1
index 5995803232..98e3520731 100644
--- a/scripts/bk_tests/bk_win_functional.ps1
+++ b/scripts/bk_tests/bk_win_functional.ps1
@@ -24,7 +24,8 @@ Write-Output "--- configure winrm"
winrm quickconfig -q
Write-Output "--- bundle install"
-bundle install --jobs=3 --retry=3 --without omnibus_package
+bundle config set --local without omnibus_package
+bundle install --jobs=3 --retry=3
if (-not $?) { throw "Unable to install gem dependencies" }
Write-Output "+++ bundle exec rake spec:functional"
diff --git a/scripts/bk_tests/bk_win_integration.ps1 b/scripts/bk_tests/bk_win_integration.ps1
index 546a9fbb91..6592b7ae67 100644
--- a/scripts/bk_tests/bk_win_integration.ps1
+++ b/scripts/bk_tests/bk_win_integration.ps1
@@ -11,7 +11,8 @@ ruby -v
bundle --version
echo "--- bundle install"
-bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+bundle config set --local without omnibus_package docgen chefstyle
+bundle install --jobs=3 --retry=3
echo "+++ bundle exec rake spec:integration"
bundle exec rake spec:integration
diff --git a/scripts/bk_tests/bk_win_unit.ps1 b/scripts/bk_tests/bk_win_unit.ps1
index 48ad3fe283..c064cb179d 100644
--- a/scripts/bk_tests/bk_win_unit.ps1
+++ b/scripts/bk_tests/bk_win_unit.ps1
@@ -5,7 +5,8 @@ ruby -v
bundle --version
echo "--- bundle install"
-bundle install --jobs=3 --retry=3 --without omnibus_package docgen chefstyle
+bundle config set --local without omnibus_package docgen chefstyle
+bundle install --jobs=3 --retry=3
echo "+++ bundle exec rake"
bundle exec rake spec:unit