summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-04-25 12:23:01 -0700
committerTim Smith <tsmith84@gmail.com>2020-04-27 19:12:30 -0700
commit463d7fa24264fbe1f3030daba2040f601a6b4661 (patch)
tree1635222a8b7dbc1d75fd3d550d7df7ed16f3701b /kitchen-tests
parent87eb4537b3502da5b7ba95ada4fbe91f11e3311f (diff)
downloadchef-463d7fa24264fbe1f3030daba2040f601a6b4661.tar.gz
Install modern GCC on our RHEL 6 tester and remove Oracle 6
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/kitchen.yml10
1 files changed, 3 insertions, 7 deletions
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