diff options
| author | Neha Pansare <neha.pansare@progress.com> | 2022-10-12 17:29:16 +0530 |
|---|---|---|
| committer | Neha Pansare <neha.pansare@progress.com> | 2022-10-12 17:29:16 +0530 |
| commit | 52d96b021c56662c81668c923478ee3fece5406b (patch) | |
| tree | ea4e3a4a0d831af943362fb51f890c220298fa6a | |
| parent | d2d63e699603cb754ee2ad4ddf423dc5dc435aa9 (diff) | |
| download | chef-52d96b021c56662c81668c923478ee3fece5406b.tar.gz | |
Fix kitchen test failures:
1. Replace ubuntu 21.04 with 22.04 as the docker image is no longer available. This already done on main https://github.com/chef/chef/commit/8fb118d32e9b46ad08e53bd753e60b666251c5ae
2. Fix nscd installation issue on fedora by preventing it's installation on latest version as package is no longer available for fedora 34+
Signed-off-by: Neha Pansare <neha.pansare@progress.com>
| -rw-r--r-- | .github/workflows/kitchen.yml | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/linux.rb | 2 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index f58f570969..8dc84e2310 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -106,7 +106,7 @@ jobs: - 'oraclelinux-8' - 'ubuntu-1804' - 'ubuntu-2004' - - 'ubuntu-2104' + - 'ubuntu-2204' runs-on: ubuntu-latest env: FORCE_FFI_YAJL: ext diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb index f302769840..a47b11fbc9 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb @@ -57,7 +57,7 @@ ssh_known_hosts_entry "github.com" include_recipe "openssh" -include_recipe "nscd" +include_recipe "nscd" unless fedora? # fedora 34+ doesn't have nscd logrotate_package "logrotate" diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index 23fa9ad3f3..3e280edcb6 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -140,9 +140,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-21.04 +- name: ubuntu-22.04 driver: - image: dokken/ubuntu-21.04 + image: dokken/ubuntu-22.04 pid_one_command: /bin/systemd intermediate_instructions: - RUN /usr/bin/apt-get update |