diff options
| author | Tim Smith <tsmith@chef.io> | 2020-05-04 11:06:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 11:06:25 -0700 |
| commit | e3f498670daed8f01dc3f36f0cf7897c6b60756b (patch) | |
| tree | 5e57702c3d8c12441b7ed2c2581b5938c0a2f476 | |
| parent | 2582c9612f9da0194794467640ad8bc078cc4977 (diff) | |
| parent | 6445fed58691426b8551af52ffd584aa52ae5270 (diff) | |
| download | chef-e3f498670daed8f01dc3f36f0cf7897c6b60756b.tar.gz | |
Merge pull request #9740 from chef/rhel6
Fix failing RHEL 6 kitchen tests
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 15 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 10 |
3 files changed, 4 insertions, 23 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 6c60188083..2b06113617 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -488,21 +488,6 @@ steps: privileged: true single-use: true -- label: ":test-kitchen: Tests :oracle_linux: 6" - commands: - - scripts/bk_tests/bk_linux_exec.sh - - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-6 - artifact_paths: - - $PWD/.kitchen/logs/kitchen.log - env: - KITCHEN_YAML: kitchen.yml - expeditor: - executor: - linux: - privileged: true - single-use: true - - label: ":test-kitchen: Tests :oracle_linux: 7" commands: - scripts/bk_tests/bk_linux_exec.sh diff --git a/chef.gemspec b/chef.gemspec index ee7ba80460..65e691bd28 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |s| s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2" s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support - s.add_dependency "bcrypt_pbkdf", "~> 1.0" # ed25519 ssh key support + s.add_dependency "bcrypt_pbkdf", "= 1.1.0.rc1" # ed25519 ssh key support s.add_dependency "highline", ">= 1.6.9", "< 3" s.add_dependency "tty-screen", "~> 0.6" # knife list s.add_dependency "pastel" # knife ui.color diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index b13b31125e..c2aff0e6cb 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -75,6 +75,9 @@ platforms: pid_one_command: /sbin/init intermediate_instructions: - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers + - RUN yum install -y centos-release-scl + - RUN yum install -y devtoolset-7 + - RUN scl enable devtoolset-7 bash - name: centos-7 driver: @@ -92,13 +95,6 @@ platforms: - RUN yum -y install e2fsprogs - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers -- name: oraclelinux-6 - driver: - image: dokken/oraclelinux-6 - pid_one_command: /sbin/init - intermediate_instructions: - - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - - name: oraclelinux-7 driver: image: dokken/oraclelinux-7 |