diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-04-25 12:23:01 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-04-27 19:12:30 -0700 |
| commit | 463d7fa24264fbe1f3030daba2040f601a6b4661 (patch) | |
| tree | 1635222a8b7dbc1d75fd3d550d7df7ed16f3701b | |
| parent | 87eb4537b3502da5b7ba95ada4fbe91f11e3311f (diff) | |
| download | chef-463d7fa24264fbe1f3030daba2040f601a6b4661.tar.gz | |
Install modern GCC on our RHEL 6 tester and remove Oracle 6
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 15 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 10 |
2 files changed, 3 insertions, 22 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/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 |