summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-10-16 21:19:36 -0700
committerGitHub <noreply@github.com>2021-10-16 21:19:36 -0700
commit783bc088f133bde99b7b92502b638519d67864bf (patch)
tree330183d072454e5636622536737fba0c7bbb2a5e
parentbdbc25af1b618bcab01990e19973031d648a87df (diff)
parent0974e7aa393b02f1b42bfbfa0a8dabcf795fcffc (diff)
downloadchef-783bc088f133bde99b7b92502b638519d67864bf.tar.gz
Merge pull request #12058 from chef/2110
Replace Ubuntu 21.04 kitchen tests with 21.10
-rw-r--r--.github/workflows/kitchen.yml2
-rw-r--r--kitchen-tests/kitchen.yml16
2 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index a34cdd6d38..2e51c21ab6 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -108,7 +108,7 @@ jobs:
- 'oraclelinux-8'
- 'ubuntu-1804'
- 'ubuntu-2004'
- - 'ubuntu-2104'
+ - 'ubuntu-2110'
runs-on: ubuntu-latest
env:
FORCE_FFI_YAJL: ext
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index beb92d12cb..0e2811f73a 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -49,7 +49,7 @@ platforms:
image: dokken/debian-9
pid_one_command: /bin/systemd
intermediate_instructions:
- - RUN /usr/bin/apt-get update
+ - RUN /usr/bin/apt-get update -y
- RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource
- name: debian-10
@@ -57,7 +57,7 @@ platforms:
image: dokken/debian-10
pid_one_command: /bin/systemd
intermediate_instructions:
- - RUN /usr/bin/apt-get update
+ - RUN /usr/bin/apt-get update -y
- RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource
- name: debian-11
@@ -65,7 +65,7 @@ platforms:
image: dokken/debian-11
pid_one_command: /bin/systemd
intermediate_instructions:
- - RUN /usr/bin/apt-get update
+ - RUN /usr/bin/apt-get update -y
- RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource
- name: centos-6
@@ -124,7 +124,7 @@ platforms:
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd
intermediate_instructions:
- - RUN /usr/bin/apt-get update
+ - RUN /usr/bin/apt-get update -y
- RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource
- name: ubuntu-20.04
@@ -132,15 +132,15 @@ platforms:
image: dokken/ubuntu-20.04
pid_one_command: /bin/systemd
intermediate_instructions:
- - RUN /usr/bin/apt-get update
+ - RUN /usr/bin/apt-get update -y
- RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource testing
-- name: ubuntu-21.04
+- name: ubuntu-21.10
driver:
- image: dokken/ubuntu-21.04
+ image: dokken/ubuntu-21.10
pid_one_command: /bin/systemd
intermediate_instructions:
- - RUN /usr/bin/apt-get update
+ - RUN /usr/bin/apt-get update -y
- RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource testing
- name: opensuse-leap-15