summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-01-15 09:04:44 -0800
committerGitHub <noreply@github.com>2021-01-15 09:04:44 -0800
commit819fce419a3c4e61a0e46fae9e1e2b1b800c7cdc (patch)
treefe1242b621a5aa950ee4479311edf611b3f9d455
parentd6da257097c1960725e54bc1e56e02257219e25d (diff)
parent3f3cc034299a96c94cee5ad1fc778ed2b51d2897 (diff)
downloadchef-819fce419a3c4e61a0e46fae9e1e2b1b800c7cdc.tar.gz
Merge pull request #10884 from chef/remove_26
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml63
1 files changed, 10 insertions, 53 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 2b28f3c132..1121e04dd3 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -15,6 +15,16 @@ steps:
# Tests Ruby 2.7
#########################################################################
+- label: "Chefstyle :ruby: 2.7"
+ commands:
+ - /workdir/.expeditor/scripts/bk_container_prep.sh
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
+ - bundle exec rake style
+ expeditor:
+ executor:
+ docker:
+ image: rubydistros/ubuntu-18.04:2.7
+
- label: "Integration Ubuntu 18.04 :ruby: 2.7"
commands:
- /workdir/.expeditor/scripts/bk_container_prep.sh
@@ -239,59 +249,6 @@ steps:
shell: ["powershell", "-Command"]
#########################################################################
-# Tests Ruby 2.6
-#########################################################################
-
-- label: "Chefstyle :ruby: 2.6"
- commands:
- - gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
- - /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package ruby_prof
- - bundle exec rake style
- expeditor:
- executor:
- docker:
- image: rubydistros/ubuntu-18.04:2.6
-
-- label: "Integration :ruby: 2.6"
- commands:
- - gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
- - /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
- - bundle exec rake spec:integration
- expeditor:
- executor:
- docker:
- image: rubydistros/ubuntu-18.04:2.6
- privileged: true
-
-- label: "Functional :ruby: 2.6"
- commands:
- - gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
- - /workdir/.expeditor/scripts/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
- - bundle exec rake spec:functional
- expeditor:
- executor:
- docker:
- image: rubydistros/ubuntu-18.04:2.6
- privileged: true
-
-- label: "Unit :ruby: 2.6"
- commands:
- - gem install bundler -v 2.1.4 # match Ruby 2.7 bundler
- - /workdir/.expeditor/scripts/bk_container_prep.sh
- - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
- - bundle exec rake spec:unit
- - bundle exec rake component_specs
- expeditor:
- executor:
- docker:
- image: rubydistros/ubuntu-18.04:2.6
-
-#########################################################################
# EXTERNAL GEM TESTING
#########################################################################