summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-29 11:30:42 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-30 12:17:38 -0800
commita8754dca615d04424c0a2be66b9185c2cc344c29 (patch)
tree317133bdfc69d750fc04ea1b6adb0dc8b018121c
parent915aba0928a1b8aa029fbbef06f42af8555ca5ba (diff)
downloadchef-a8754dca615d04424c0a2be66b9185c2cc344c29.tar.gz
Remove Test Kitchen tests for Amazon Linux 201X
The version of ld on Amazon Linux 201x cannot handle the ffi gem so these tests are going to fail forever now. This is a RHEL 6 based distro that is EOL as of the end of 2020. https://aws.amazon.com/blogs/aws/update-on-amazon-linux-ami-end-of-life/ Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml15
-rw-r--r--kitchen-tests/kitchen.yml8
2 files changed, 0 insertions, 23 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 53fd7d5466..359169c825 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -364,21 +364,6 @@ steps:
# START TEST KITCHEN ONLY
#########################################################################
-- label: "Kitchen: Amazon Linux 201X"
- commands:
- - .expeditor/scripts/bk_linux_exec.sh
- - cd kitchen-tests
- - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux
- artifact_paths:
- - $PWD/.kitchen/logs/kitchen.log
- env:
- KITCHEN_YAML: kitchen.yml
- expeditor:
- executor:
- linux:
- privileged: true
- single-use: true
-
- label: "Kitchen: Amazon Linux 2"
commands:
- .expeditor/scripts/bk_linux_exec.sh
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 660c17d2aa..5e7d4a4a8d 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -20,7 +20,6 @@ lifecycle:
- remote: echo "Chef container's Chef / Ohai release:"
- remote: /opt/chef/bin/chef-client -v
- remote: /opt/chef/bin/ohai -v
- - 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
@@ -33,13 +32,6 @@ verifier:
format: progress
platforms:
-- name: amazonlinux
- driver:
- image: dokken/amazonlinux
- pid_one_command: /sbin/init
- intermediate_instructions:
- - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
-
- name: amazonlinux-2
driver:
image: dokken/amazonlinux-2