diff options
author | Tim Smith <tsmith@chef.io> | 2020-12-21 21:15:13 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-21 21:15:13 -0800 |
commit | ebcaa97ec4a6447b9cbfd6c9249ef77b6ad1bedd (patch) | |
tree | 7c65e8bc46aeaf6b2f97b96504dc5e96fafc9033 | |
parent | 57655244be360f3e9620210633035efe5c049161 (diff) | |
parent | 9b5fc812d89833a64427adc166aa2045841563f1 (diff) | |
download | chef-ebcaa97ec4a6447b9cbfd6c9249ef77b6ad1bedd.tar.gz |
Merge pull request #10765 from chef/remove_ubuntu1604
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | .expeditor/release.omnibus.yml | 3 | ||||
-rw-r--r-- | .expeditor/verify.pipeline.yml | 16 | ||||
-rw-r--r-- | kitchen-tests/kitchen.yml | 7 | ||||
-rw-r--r-- | omnibus/kitchen.yml | 2 |
4 files changed, 2 insertions, 26 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 00db741db7..0736e929a5 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -55,8 +55,7 @@ builder-to-testers-map: ubuntu-18.04-aarch64: - ubuntu-18.04-aarch64 - ubuntu-20.04-aarch64 - ubuntu-16.04-x86_64: - - ubuntu-16.04-x86_64 + ubuntu-18.04-x86_64: - ubuntu-18.04-x86_64 - ubuntu-20.04-x86_64 windows-2012r2-i386: diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 272c3ad8af..46be10c14f 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -390,22 +390,6 @@ steps: privileged: true single-use: true -- label: "Kitchen: Ubuntu 16.04" - commands: - - scripts/bk_tests/bk_linux_exec.sh - - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1604 - artifact_paths: - - $PWD/.kitchen/logs/kitchen.log - env: - UBUNTU: "16.04" - KITCHEN_YAML: kitchen.yml - expeditor: - executor: - linux: - privileged: true - single-use: true - - label: "Kitchen: Ubuntu 18.04" commands: - scripts/bk_tests/bk_linux_exec.sh diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index 53641a6602..4b56d70fe1 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -114,13 +114,6 @@ platforms: intermediate_instructions: - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers -- name: ubuntu-16.04 - driver: - image: dokken/ubuntu-16.04 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - name: ubuntu-18.04 driver: image: dokken/ubuntu-18.04 diff --git a/omnibus/kitchen.yml b/omnibus/kitchen.yml index bd2893ab83..a3db5b8499 100644 --- a/omnibus/kitchen.yml +++ b/omnibus/kitchen.yml @@ -38,7 +38,7 @@ platforms: run_list: apt::default - name: freebsd-11 run_list: freebsd::portsnap - - name: ubuntu-16.04 + - name: ubuntu-18.04 run_list: apt::default # macOS |