diff options
| author | Tim Smith <tsmith@chef.io> | 2020-12-29 11:34:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 11:34:16 -0800 |
| commit | 57848c4bdb0695c209e2a60edca299faf2052552 (patch) | |
| tree | 4508b2d54b2f695d411c0b946a71567437bca297 | |
| parent | cf0a57e70248c5f58feacd3d0a55157dad0bbe8c (diff) | |
| parent | d0d47dfad6a006085bbe82553188eb2af77c7439 (diff) | |
| download | chef-57848c4bdb0695c209e2a60edca299faf2052552.tar.gz | |
Merge pull request #10789 from chef/remove_amazon_linux_tests
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 15 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 8 |
2 files changed, 0 insertions, 23 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 1bbd2163ee..23b0eaef81 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 bc68607afe..ce263413be 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 |