summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-05-01 10:52:26 -0700
committerTim Smith <tsmith@chef.io>2019-05-29 14:05:49 -0700
commit33a22bbc0a57717b87ca68b4ddf4f8318ee2a8f1 (patch)
tree51d24ce89c6002a8b1cf311c4c07b1cca3d8c310
parentee06ecdfbaa86b0fdd38afae7f514f92bd3e3c8c (diff)
downloadchef-33a22bbc0a57717b87ca68b4ddf4f8318ee2a8f1.tar.gz
Remove old maintainer gems from the Gemfile
These were used by our maintainer rake tasks. These are all gone now so there's no need for these gems. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml12
-rw-r--r--.travis.yml14
-rw-r--r--Gemfile8
-rw-r--r--appveyor.yml2
4 files changed, 14 insertions, 22 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index bbce0ad99e..5aaa0aefda 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -9,7 +9,7 @@ steps:
# - /workdir/scripts/bk_tests/bk_install.sh
# - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
# - cp /etc/hosts.noip6 /etc/hosts
-# - cd /workdir; bundle install --without docgen integration omnibus_package --frozen
+# - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen
# - bundle exec rake spec:integration
# expeditor:
# executor:
@@ -25,7 +25,7 @@ steps:
# - /workdir/scripts/bk_tests/bk_install.sh
# - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
# - cp /etc/hosts.noip6 /etc/hosts
-# - cd /workdir; bundle install --without docgen integration omnibus_package --frozen
+# - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen
# - bundle exec rake spec:functional
# expeditor:
# executor:
@@ -38,7 +38,7 @@ steps:
- label: "Unit Specs :ruby: 2.6"
commands:
- /workdir/scripts/bk_tests/bk_install.sh
- - bundle install --without docgen integration omnibus_package --frozen
+ - bundle install --without ci docgen guard integration omnibus_package --frozen
- bundle exec rake spec:unit
- bundle exec rake component_specs
expeditor:
@@ -127,7 +127,7 @@ steps:
# - asdf local ruby 2.5.5
# - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
# - cp /etc/hosts.noip6 /etc/hosts
-# - bundle install --without docgen integration omnibus_package --frozen
+# - bundle install --without ci docgen guard integration omnibus_package --frozen
# - bundle exec rake spec:integration
# expeditor:
# executor:
@@ -143,7 +143,7 @@ steps:
# - /workdir/scripts/bk_tests/bk_install.sh
# - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
# - cp /etc/hosts.noip6 /etc/hosts
-# - bundle install --without docgen integration omnibus_package --frozen
+# - bundle install --without ci docgen guard integration omnibus_package --frozen
# - bundle exec rake spec:functional
# expeditor:
# executor:
@@ -157,7 +157,7 @@ steps:
commands:
- asdf local ruby 2.5.5
- /workdir/scripts/bk_tests/bk_install.sh
- - bundle install --without docgen integration omnibus_package --frozen
+ - bundle install --without ci docgen guard integration omnibus_package --frozen
- bundle exec rake spec:unit
- bundle exec rake component_specs
expeditor:
diff --git a/.travis.yml b/.travis.yml
index 4e4bdccfc6..a65f0d1c45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,13 +46,13 @@ matrix:
rvm: 2.5.5
sudo: true
script: sudo -E $(which bundle) exec rake spec:integration;
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+ bundler_args: --without ci docgen guard integration omnibus_package --frozen
- env:
INTEGRATION_SPECS_26: 1
rvm: 2.6.2
sudo: true
script: sudo -E $(which bundle) exec rake spec:integration;
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+ bundler_args: --without ci docgen guard integration omnibus_package --frozen
- env:
FUNCTIONAL_SPECS_24: 1
rvm: 2.4.5
@@ -66,13 +66,13 @@ matrix:
sudo: true
# the travis apt proxy screws with our functional testing something fierce
script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional;
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+ bundler_args: --without ci docgen guard integration omnibus_package --frozen
- env:
FUNCTIONAL_SPECS_26: 1
rvm: 2.6.2
sudo: true
script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional;
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+ bundler_args: --without ci docgen guard integration omnibus_package --frozen
- env:
UNIT_SPECS_24: 1
rvm: 2.4.5
@@ -88,7 +88,7 @@ matrix:
script:
- sudo -E $(which bundle) exec rake spec:unit;
- sudo -E $(which bundle) exec rake component_specs
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+ bundler_args: --without ci docgen guard integration omnibus_package --frozen
- env:
UNIT_SPECS_26: 1
rvm: 2.6.2
@@ -96,13 +96,13 @@ matrix:
script:
- sudo -E $(which bundle) exec rake spec:unit;
- sudo -E $(which bundle) exec rake component_specs
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+ bundler_args: --without ci docgen guard integration omnibus_package --frozen
- env:
CHEFSTYLE: 1
rvm: 2.5.5
script: bundle exec rake style
# also remove integration / external tests
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+ bundler_args: --without ci docgen guard integration omnibus_package --frozen
#
# External tests
#
diff --git a/Gemfile b/Gemfile
index 0699d99cc2..d6bf3d5c89 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,14 +28,6 @@ group(:docgen) do
gem "yard"
end
-group(:maintenance) do
- gem "tomlrb"
-
- # To sync maintainers with github
- gem "octokit"
- gem "netrc"
-end
-
# Everything except AIX
group(:ruby_prof) do
gem "ruby-prof"
diff --git a/appveyor.yml b/appveyor.yml
index e5ad88b8a3..3fe5e7b456 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,7 +43,7 @@ install:
- echo %PATH%
- appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem
- set SSL_CERT_FILE=C:\cacert.pem
- - SET BUNDLE_WITHOUT=server:docgen:maintenance:pry:travis:integration:ci
+ - SET BUNDLE_WITHOUT=server:docgen:pry:integration:ci
- bundle config --local path vendor/bundle # use the cache we define above
- bundle install || bundle install || bundle install
- SET SPEC_OPTS=--format progress