diff options
| author | Lamont Granquist <lamont@opscode.com> | 2021-03-03 20:32:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 20:32:47 -0800 |
| commit | 3e6bd615f3733b375b6e4e9a42329763617dd0bc (patch) | |
| tree | 66e55f6bb0bad50449f021b051414a099f0494e1 | |
| parent | f7d48da299231d57ddff6755a294a5d4c7ca6aac (diff) | |
| parent | ba20f3856ba24a15049bc15e84a70ee2abb445c1 (diff) | |
| download | chef-3e6bd615f3733b375b6e4e9a42329763617dd0bc.tar.gz | |
Merge pull request #11126 from chef/lcg/pin-ffi-for-rhel6
Fix ffi installs on RHEL6 test-kitchen runs
| -rw-r--r-- | kitchen-tests/kitchen.yml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index d1780f94f2..6d915e4e78 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -21,8 +21,18 @@ lifecycle: - remote: /opt/chef/bin/chef-client -v - remote: /opt/chef/bin/ohai -v - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc + - remote: scl enable devtoolset-8 '/opt/chef/embedded/bin/appbundle-updater chef ohai <%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %> --tarball --github chef/ohai' + includes: + - centos-6 + - remote: scl enable devtoolset-8 '/opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT'] || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef' + includes: + - centos-6 - remote: /opt/chef/embedded/bin/appbundle-updater chef ohai <%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %> --tarball --github chef/ohai + excludes: + - centos-6 - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT'] || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef + excludes: + - centos-6 - remote: echo "Installed Chef / Ohai release:" - remote: /opt/chef/bin/chef-client -v - remote: /opt/chef/bin/ohai -v @@ -71,8 +81,7 @@ platforms: - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - RUN wget -O /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo - RUN printf "[centos-sclo-rh]\nname=CentOS-6 - SCLo rh\nbaseurl=http://vault.centos.org/centos/6/sclo/x86_64/rh\ngpgcheck=1\nenabled=1\ngpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo" > /etc/yum.repos.d/CentOS-SCLo-rh.repo - - RUN yum install -y devtoolset-7 - - RUN scl enable devtoolset-7 bash + - RUN yum install -y devtoolset-8 - name: centos-7 driver: |