summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-01-15 09:09:34 -0800
committerTim Smith <tsmith84@gmail.com>2021-01-15 09:09:34 -0800
commitbeb2a4246ac29d8bd786a98c5f895eece7e3d907 (patch)
treea212aae90e5718771f402edeafa532ad55c5657b
parent3f3cc034299a96c94cee5ad1fc778ed2b51d2897 (diff)
downloadchef-beb2a4246ac29d8bd786a98c5f895eece7e3d907.tar.gz
Test chef-utils and chef-config on Ruby 2.6 still
Since the world deps on these we really need a longer Ruby lifecycle here Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml26
-rw-r--r--chef-config/chef-config.gemspec2
-rw-r--r--chef-utils/chef-utils.gemspec2
3 files changed, 28 insertions, 2 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 1121e04dd3..661017c0c1 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -12,6 +12,32 @@ expeditor:
steps:
#########################################################################
+ # Tests Ruby 2.6
+#########################################################################
+
+- label: "chef-utils Unit :ruby: 2.6"
+ commands:
+ - /workdir/.expeditor/scripts/bk_container_prep.sh
+ - cd chef-utils
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
+ - bundle exec rake spec
+ expeditor:
+ executor:
+ docker:
+ image: rubydistros/ubuntu-18.04:2.6
+
+- label: "chef-config Unit :ruby: 2.6"
+ commands:
+ - /workdir/.expeditor/scripts/bk_container_prep.sh
+ - cd chef-config
+ - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package
+ - bundle exec rake spec
+ expeditor:
+ executor:
+ docker:
+ image: rubydistros/ubuntu-18.04:2.6
+
+#########################################################################
# Tests Ruby 2.7
#########################################################################
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 08086ff25b..cf83b360df 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
spec.homepage = "https://github.com/chef/chef"
spec.license = "Apache-2.0"
- spec.required_ruby_version = ">= 2.6.0"
+ spec.required_ruby_version = ">= 2.6"
spec.metadata = {
"bug_tracker_uri" => "https://github.com/chef/chef/issues",
diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec
index 836fef1ff9..a72b32936d 100644
--- a/chef-utils/chef-utils.gemspec
+++ b/chef-utils/chef-utils.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
spec.homepage = "https://github.com/chef/chef/tree/master/chef-utils"
spec.license = "Apache-2.0"
- spec.required_ruby_version = ">= 2.6.0"
+ spec.required_ruby_version = ">= 2.6"
spec.metadata = {
"bug_tracker_uri" => "https://github.com/chef/chef/issues",