summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-29 11:48:49 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-30 12:17:44 -0800
commit569807df328e788745eceaeed0ddb2d5b0adddc2 (patch)
tree343acd021e8a17faa9a524d1cb3c2ef699bd137d
parenta8754dca615d04424c0a2be66b9185c2cc344c29 (diff)
downloadchef-569807df328e788745eceaeed0ddb2d5b0adddc2.tar.gz
Replace Ubuntu 20.10 testing with 21.04
These containers are alpha/beta quality, but we should start testing on this since it'll be out when Chef Infra 17 is released. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml4
-rw-r--r--kitchen-tests/kitchen.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 359169c825..b02e36b688 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -425,11 +425,11 @@ steps:
privileged: true
single-use: true
-- label: "Kitchen: Ubuntu 20.10"
+- label: "Kitchen: Ubuntu 21.04"
commands:
- .expeditor/scripts/bk_linux_exec.sh
- cd kitchen-tests
- - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2010
+ - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2104
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 5e7d4a4a8d..23521f480d 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -130,9 +130,9 @@ platforms:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource testing
-- name: ubuntu-20.10
+- name: ubuntu-21.04
driver:
- image: dokken/ubuntu-20.10
+ image: dokken/ubuntu-21.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update