summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-18 18:43:49 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-18 18:43:49 -0800
commit9b5fc812d89833a64427adc166aa2045841563f1 (patch)
treeded868f475463cce1c61df2d178488c977c3684c
parentcd1ad9d5e9ebc3a301d68285ade8c637f2b15345 (diff)
downloadchef-remove_ubuntu1604.tar.gz
Remove support for Ubuntu 16.04remove_ubuntu1604
By the time we ship Chef 17 Ubuntu 16.04 will be EOL. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/release.omnibus.yml3
-rw-r--r--.expeditor/verify.pipeline.yml16
-rw-r--r--kitchen-tests/kitchen.yml7
-rw-r--r--omnibus/kitchen.yml2
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