diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-05-21 16:12:34 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-05-21 16:12:34 -0700 |
| commit | 01302581de7a5a522c8c4e1d29352590d3f12de0 (patch) | |
| tree | c93d3621a7be9c40526380312e24c64d1f7cc520 | |
| parent | 4d435357873f8836cb033e6e4f7b2cf85b936672 (diff) | |
| download | chef-01302581de7a5a522c8c4e1d29352590d3f12de0.tar.gz | |
Update kitchen tests to upgrade GCC on RHEL 6
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | kitchen-tests/kitchen.yml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index 687a2b4b10..3ceb111f6a 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -17,16 +17,16 @@ provisioner: lifecycle: pre_converge: - remote: echo "Chef container's Chef / Ohai release:" - - remote: /opt/chef/embedded/bin/chef-client -v - - remote: /opt/chef/embedded/bin/ohai -v + - remote: /opt/chef/bin/chef-client -v + - remote: /opt/chef/bin/ohai -v - remote: /opt/chef/embedded/bin/rake --version - remote: /opt/chef/embedded/bin/bundle -v - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc - 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 - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT'] || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef - remote: echo "Installed Chef / Ohai release:" - - remote: /opt/chef/embedded/bin/chef-client -v - - remote: /opt/chef/embedded/bin/ohai -v + - remote: /opt/chef/bin/chef-client -v + - remote: /opt/chef/bin/ohai -v verifier: name: inspec @@ -74,6 +74,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: @@ -91,13 +94,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 @@ -150,6 +146,7 @@ platforms: intermediate_instructions: - RUN /usr/bin/zypper --non-interactive update - RUN /usr/bin/zypper --non-interactive install cron + - RUN /usr/bin/zypper --non-interactive install insserv-compat suites: - name: end-to-end |