summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjayashri garud <jgarud@msystechnologies.com>2021-08-16 19:22:58 +0530
committerjayashri garud <jgarud@msystechnologies.com>2021-08-16 19:22:58 +0530
commitace24911cb907717750b03aedc607b0f2efcad0e (patch)
treee6eb882f99d727f6b198be710a4f6a6ee32c4da2
parent9580f6d19ff63b29c1feb275b56545a064f76697 (diff)
downloadchef-ace24911cb907717750b03aedc607b0f2efcad0e.tar.gz
Adding local config option
Signed-off-by: jayashri garud <jgarud@msystechnologies.com>
-rw-r--r--.expeditor/scripts/bk_win_prep.ps12
-rw-r--r--.expeditor/verify.pipeline.yml44
-rw-r--r--.github/workflows/kitchen.yml4
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/README.md8
5 files changed, 30 insertions, 30 deletions
diff --git a/.expeditor/scripts/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1
index d5bdb82fed..69f35a1ff2 100644
--- a/.expeditor/scripts/bk_win_prep.ps1
+++ b/.expeditor/scripts/bk_win_prep.ps1
@@ -11,6 +11,6 @@ bundle --version
if (-not $?) { throw "Can't run Bundler. Is it installed?" }
echo "--- bundle install"
-bundle config set without omnibus_package
+bundle config set --local without omnibus_package
bundle install --jobs=3 --retry=3 --path=vendor/bundle
if (-not $?) { throw "Unable to install gem dependencies" } \ No newline at end of file
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 70c3e81329..9e3f0669ab 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -19,7 +19,7 @@ steps:
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- cd chef-utils
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec
expeditor:
@@ -31,7 +31,7 @@ steps:
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- cd chef-config
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec
expeditor:
@@ -46,7 +46,7 @@ steps:
- label: "Integration Ubuntu 18.04 :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
@@ -60,7 +60,7 @@ steps:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- apt-get update -y
- apt-get install -y cron locales # needed for functional tests to pass
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
@@ -72,7 +72,7 @@ steps:
- label: "Unit Ubuntu 18.04 :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
@@ -84,7 +84,7 @@ steps:
- label: "Integration Ubuntu 20.04 :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
@@ -98,7 +98,7 @@ steps:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- apt-get update -y
- apt-get install -y cron locales # needed for functional tests to pass
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
@@ -110,7 +110,7 @@ steps:
- label: "Unit Ubuntu 20.04 :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
@@ -122,7 +122,7 @@ steps:
- label: "Integration CentOS 7 :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
@@ -135,7 +135,7 @@ steps:
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- yum install -y crontabs e2fsprogs
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
@@ -147,7 +147,7 @@ steps:
- label: "Unit CentOS 7 :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
@@ -160,7 +160,7 @@ steps:
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- zypper install -y cron insserv-compat
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
@@ -173,7 +173,7 @@ steps:
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- zypper install -y cronie insserv-compat
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
@@ -186,7 +186,7 @@ steps:
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- zypper install -y cron insserv-compat
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
@@ -198,7 +198,7 @@ steps:
- label: "Integration Fedora :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:integration
expeditor:
@@ -211,7 +211,7 @@ steps:
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- dnf install -y crontabs e2fsprogs
- - cd /workdir; bundle config set without omnibus_package
+ - cd /workdir; bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:functional
expeditor:
@@ -226,7 +226,7 @@ steps:
- label: "Unit Fedora :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec rake spec:unit
- bundle exec rake component_specs
@@ -278,7 +278,7 @@ steps:
- label: "chef-zero gem :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chef/chef-zero master rake pedant
expeditor:
@@ -292,7 +292,7 @@ steps:
- label: "cheffish gem :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chef/cheffish master rake spec
expeditor:
@@ -303,7 +303,7 @@ steps:
- label: "chefspec gem :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chefspec/chefspec master rake
expeditor:
@@ -314,7 +314,7 @@ steps:
- label: "knife-windows gem :ruby: 3.0"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test chef/knife-windows master rake spec
expeditor:
@@ -327,7 +327,7 @@ steps:
- /workdir/.expeditor/scripts/bk_container_prep.sh
- apt-get update -y
- apt-get install -y graphviz
- - bundle config set without omnibus_package
+ - bundle config set --local without omnibus_package
- bundle install --jobs=3 --retry=3 --path=vendor/bundle
- bundle exec tasks/bin/run_external_test berkshelf/berkshelf master rake
expeditor:
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index afce7211b3..5fa865bb34 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -40,7 +40,7 @@ jobs:
run: |
cd kitchen-tests
$env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
- bundle config set without 'omnibus_package'
+ bundle config set --local without 'omnibus_package'
bundle install --jobs=3 --retry=3 --path=vendor/bundle
gem install berkshelf --no-doc
# berks emits a ruby warning when it loads net/http due to a previously
@@ -82,7 +82,7 @@ jobs:
id: run
run: |
cd kitchen-tests
- sudo /opt/chef/embedded/bin/bundle config set without 'omnibus_package'
+ sudo /opt/chef/embedded/bin/bundle config set --local without 'omnibus_package'
sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3 --path=vendor/bundle
sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc
sudo /opt/chef/embedded/bin/berks vendor cookbooks
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 9c9802f4c6..14d2f3e698 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -9,7 +9,7 @@ gem "pedump"
# This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need
# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
-# by running `bundle config set without development && bundle install` to speed up build times.
+# by running `bundle config set --local without development && bundle install` to speed up build times.
group :development do
# Use Berkshelf for resolving cookbook dependencies
gem "berkshelf", ">= 7.0"
diff --git a/omnibus/README.md b/omnibus/README.md
index 79c809b70f..2055f6c0fd 100644
--- a/omnibus/README.md
+++ b/omnibus/README.md
@@ -10,7 +10,7 @@ This project creates full-stack platform-specific packages for the following pro
You must have a sane Ruby environment with Bundler installed. Ensure all the required gems are installed:
```shell
-bundle config set without development
+bundle config set --local without development
bundle install
```
@@ -81,7 +81,7 @@ Then login to the instance and build the project as described in the Usage secti
```shell
$ bundle exec kitchen login <PROJECT>-ubuntu-1204
[vagrant@ubuntu...] $ cd chef/omnibus
-[vagrant@ubuntu...] $ bundle config set without development # Don't install dev tools!
+[vagrant@ubuntu...] $ bundle config set --local without development # Don't install dev tools!
[vagrant@ubuntu...] $ bundle install
[vagrant@ubuntu...] $ ...
[vagrant@ubuntu...] $ bundle exec omnibus build <PROJECT> -l internal
@@ -91,7 +91,7 @@ $ bundle exec kitchen login <PROJECT>-ubuntu-1204
$ kitchen login chef-ubuntu-1604
[vagrant@ubuntu...] $ source load-omnibus-toolchain.sh
[vagrant@ubuntu...] $ cd chef/omnibus
-[vagrant@ubuntu...] $ bundle config set without development # Don't install dev tools!
+[vagrant@ubuntu...] $ bundle config set --local without development # Don't install dev tools!
[vagrant@ubuntu...] $ bundle install
[vagrant@ubuntu...] $ ...
[vagrant@ubuntu...] $ bundle exec omnibus build chef -l internal
@@ -109,7 +109,7 @@ C:\>C:\vagrant\load-omnibus-toolchain.ps1
C:\>cd C:\vagrant\chef\omnibus
-C:\vagrant\chef\omnibus>bundle config set without development
+C:\vagrant\chef\omnibus>bundle config set --local without development
C:\vagrant\chef\omnibus>bundle install