diff options
| author | Tim Smith <tsmith@chef.io> | 2021-05-07 14:16:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 14:16:32 -0700 |
| commit | 10c220e83fdbf51e01b0387217c48d7a893f5a5c (patch) | |
| tree | b18c570db92505e29e61961923d2b0d0a033623d | |
| parent | 06776e7eba47324a5fcee5d414616b8ae99f1c49 (diff) | |
| parent | 424ffa0eb902e02548468bf0d4e59e8c90b3157e (diff) | |
| download | chef-10c220e83fdbf51e01b0387217c48d7a893f5a5c.tar.gz | |
Merge pull request #11546 from chef/kitchen_actions
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .github/workflows/kitchen.yml | 7 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/linux.rb | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 5c3e6b74df..1aec12a534 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -94,22 +94,25 @@ jobs: matrix: os: - 'amazonlinux-2' + - 'centos-6' - 'centos-7' - 'centos-8' - 'debian-9' - 'debian-10' + - 'debian-11' - 'fedora-latest' - 'opensuse-leap-15' + - 'oraclelinux-7' + - 'oraclelinux-8' - 'ubuntu-1804' - 'ubuntu-2004' + - 'ubuntu-2104' runs-on: ubuntu-latest env: BUNDLE_GEMFILE: kitchen-tests/Gemfile FORCE_FFI_YAJL: ext CHEF_LICENSE: accept-no-persist steps: - - name: Install FFI - run: "sudo apt-get update; sudo apt-get install libffi-dev build-essential libssl-dev libreadline-dev zlib1g-dev -y" - name: Check out code uses: actions/checkout@master - name: Setup Ruby diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb index cd8c9c4d27..30754cc483 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb @@ -37,7 +37,7 @@ end include_recipe "::_packages" -include_recipe "ntp" +include_recipe "ntp" unless fedora? # fedora 34+ doesn't have NTP resolver_config "/etc/resolv.conf" do nameservers [ "8.8.8.8", "8.8.4.4" ] |