diff options
| author | John <john.mccrae@progress.com> | 2023-04-12 08:16:38 -0700 |
|---|---|---|
| committer | John <john.mccrae@progress.com> | 2023-04-12 08:16:38 -0700 |
| commit | 9680062881aa54af05a2a0f13f51350c5dc7a2bb (patch) | |
| tree | 720a44ae7917d2eb8301bf49bcb361a9e40f3c20 | |
| parent | 524ddd4396634208df7aae36adea578327be6528 (diff) | |
| download | chef-9680062881aa54af05a2a0f13f51350c5dc7a2bb.tar.gz | |
Refactoring some tests to use Ruby 2.7, also updating Berkshelf to pull from the correct source
Signed-off-by: John <john.mccrae@progress.com>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 10 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index d696086638..ca6f7b2dbe 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -12,10 +12,10 @@ expeditor: steps: ######################################################################### - # Tests Ruby 2.6 + # Tests Ruby 2.7 ######################################################################### -- label: "chef-utils Unit :ruby: 3.0" +- label: "chef-utils Unit :ruby: 2.7" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - cd chef-utils @@ -26,9 +26,9 @@ steps: expeditor: executor: docker: - image: rubydistros/ubuntu-18.04:3.0 + image: rubydistros/ubuntu-18.04:2.7 -- label: "chef-config Unit :ruby: 2.6" +- label: "chef-config Unit :ruby: 2.7" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - cd chef-config @@ -39,7 +39,7 @@ steps: expeditor: executor: docker: - image: rubydistros/ubuntu-18.04:3.0 + image: rubydistros/ubuntu-18.04:2.7 ######################################################################### # Tests Ruby 3.0 diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 0a2fa1cee1..70f9506c23 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -4,7 +4,7 @@ gem "rake" # required to build some native extensions gem "chef", path: ".." gem "knife", path: "../knife" gem "ohai", git: "https://github.com/chef/ohai.git", branch: "17-stable" # avoids failures when we bump chef major -gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "main" +gem "berkshelf", git: "https://github.com/chef/berkshelf.git", branch: "main" gem "kitchen-dokken", ">= 2.0" gem "kitchen-vagrant", ">= 1.0" gem "kitchen-inspec" |