Merge pull request #14280 from chef/fix-kitche-tests

fix kitchen-tests
chef · Mar 25, 2024 · f20f727 · f20f727
2 parents ee9da07 + 32cd7e8
commit f20f727
Show file tree

Hide file tree

Showing 28 changed files with 642 additions and 385 deletions.
diff --git a/.github/workflows/func_spec.yml b/.github/workflows/func_spec.yml
@@ -17,7 +17,7 @@ jobs:
         ruby: ['3.1']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -34,7 +34,7 @@ jobs:
         ruby: ['3.1']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

diff --git a/.github/workflows/kitchen-fips.yml b/.github/workflows/kitchen-fips.yml
@@ -16,7 +16,7 @@ jobs:
         ruby: ['3.1']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: 'Install Chef/Ohai from Omnitruck'
       id: install_chef
       run: |
@@ -88,4 +88,4 @@ jobs:
       run: |
         $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
         chef-client -v
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
+        If ($lastexitcode -ne 0) { Exit $lastexitcode }
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
@@ -7,184 +7,165 @@ name: kitchen
     branches:
       - main
 
+defaults:
+  run:
+    working-directory: kitchen-tests
+
 jobs:
-  windows:
+  win_x86_64:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, windows-2019]
-        ruby: ['3.1']
+        os:
+          - windows-2019
+          - windows-2022
     runs-on: ${{ matrix.os }}
+    env:
+      CHEF_LICENSE: accept-no-persist
+      KITCHEN_LOCAL_YAML: kitchen.exec.windows.yml
     steps:
-    - uses: actions/checkout@v3
-    - name: 'Install Chef/Ohai from Omnitruck'
-      id: install_chef
-      run: |
-        . { Invoke-WebRequest -useb https://omnitruck.chef.io/install.ps1 } | Invoke-Expression; Install-Project -project chef -channel current
-        $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
-        chef-client -v
-        ohai -v
-        rake --version
-        bundle -v
-    - name: 'Upgrade Chef/Ohai via Appbundler'
-      id: upgrade
-      run: |
-        $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
-        $env:OHAI_VERSION = ( Select-String -Path .\Gemfile.lock -Pattern '(?<=ohai \()\d.*(?=\))' | ForEach-Object { $_.Matches[0].Value } )
-
-        # The chef-client installer does not put the file 'ansidecl.h' down in the correct location
-        # This leads to failures during testing. Moving that file to its correct position here.
-        # Another example of 'bad' that needs to be corrected
-        $output = gci -path C:\opscode\ -file ansidecl.h -Recurse
-
-        # As of Ruby 3.1, there are 3 ansidecl.h files found in the opscode path
-        # Grabbing the first (and shortest) path found is a bit of a :fingers-crossed: but
-        # making the leap that ansidecl.h isn't going to vary in a way that will fail
-        # subtly.
-        if ($output -is [Array]) { $output = $output[0] }
-
-        $target_path = $($output.Directory.Parent.FullName + "\x86_64-w64-mingw32\include")
-        Move-Item -Path $output.FullName -Destination $target_path
-
-        # if a different version of ffi-yajl is installed, then libyajl2 needs to be reinstalled
-        # so that libyajldll.a is present in the intermediate build step. bundler seems to skip
-        # libyajl2 build if already present. gem install seems to build anyway.
-        gem uninstall -I libyajl2
-
-        gem install appbundler appbundle-updater --no-doc
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
-        appbundle-updater chef chef $env:GITHUB_SHA --tarball --github $env:GITHUB_REPOSITORY
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
-        Write-Output "Installed Chef / Ohai release:"
-        chef-client -v
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
-        ohai -v
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
-    - name: 'Run end_to_end::default recipe'
-      id: run
-      run: |
-        cd kitchen-tests
-        $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
-        # htmldiff and ldiff on windows cause a conflict with gems being loaded below.
-        # we remove thenm here.
-        if (Test-Path C:\opscode\chef\embedded\bin\htmldiff)
-        {
-            Remove-Item -Path C:\opscode\chef\embedded\bin\htmldiff
-            Remove-Item -Path C:\opscode\chef\embedded\bin\ldiff
-        }
-
-        bundle install --jobs=3 --retry=3
-        # If ($lastexitcode -ne 0) { Exit $lastexitcode }
-        # The bundle install command above fails because our build on windows on ruby-3.0 is
-        # completely broken when it comes to installing native gems.  Until that is fixed we
-        # need to ignore that error code and to manually install berkshelf below.  This is a
-        # very bad hack.
-
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
-        gem install berkshelf --no-doc
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
-        berks vendor cookbooks
-        If ($lastexitcode -ne 0) { Exit $lastexitcode }
-        chef-client -z -o end_to_end --chef-license accept-no-persist
+    - uses: actions/checkout@v4
+    - name: Install Chef
+      uses: actionshub/chef-install@3.0.0
+    - name: Kitchen Test
+      run: kitchen test end-to-end-${{ matrix.os }}
 
-  macos:
+  mac_x86_64:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest]
-        ruby: ['3.1']
+        os:
+          - macos-latest
+          - macos-13
     runs-on: ${{ matrix.os }}
+    env:
+      CHEF_LICENSE: accept-no-persist
+      KITCHEN_LOCAL_YAML: kitchen.exec.macos.yml
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             clean: true
-      - name: 'Install Chef/Ohai from Omnitruck'
-        id: install_chef
-        run: |
-          brew install coreutils
-          curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -c current
-          /opt/chef/bin/chef-client -v
-          /opt/chef/bin/ohai -v
-          /opt/chef/embedded/bin/rake --version
-      - name: 'Upgrade Chef/Ohai via Appbundler'
-        id: upgrade
-        run: |
-          OHAI_VERSION=$(sed -n '/ohai .[0-9]/{s/.*(//;s/)//;p;}' Gemfile.lock)
-          sudo /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
-          sudo /opt/chef/embedded/bin/appbundle-updater chef chef $GITHUB_SHA --tarball --github $GITHUB_REPOSITORY
-          echo "Installed Chef / Ohai release:"
-          /opt/chef/bin/chef-client -v
-          /opt/chef/bin/ohai -v
-      - name: 'Run end_to_end::default recipe'
-        id: run
-        run: |
-          cd kitchen-tests
-          sudo /opt/chef/embedded/bin/bundle config set --local without 'omnibus_package'
-          sudo /opt/chef/embedded/bin/bundle config set --local path 'vendor/bundle'
-          sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3
-          sudo rm -f /opt/chef/embedded/bin/{htmldiff,ldiff}
-          sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc
-          sudo /opt/chef/embedded/bin/berks vendor cookbooks
-          sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist
+      - name: Install Chef
+        uses: actionshub/chef-install@3.0.0
+      - name: Kitchen Test
+        run: kitchen test end-to-end-${{ matrix.os }}
 
-  linux:
+  mac_arm64:
     strategy:
       fail-fast: false
       matrix:
         os:
-          - 'centos-6'
-          - 'centos-7'
-          - 'almalinux-8'
-          - 'debian-10'
-          - 'debian-11'
-          - 'fedora-latest'
-          - 'opensuse-leap-15'
-          - 'ubuntu-1804'
-          - 'ubuntu-2004'
-          - 'ubuntu-2204'
-        ruby: ['3.1']
+          - macos-14
+    runs-on: ${{ matrix.os }}
+    env:
+      CHEF_LICENSE: accept-no-persist
+      KITCHEN_LOCAL_YAML: kitchen.exec.macos.yml
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          clean: true
+      - name: Install Chef
+        uses: actionshub/chef-install@3.0.0
+      - name: Kitchen Test
+        run: kitchen test end-to-end-${{ matrix.os }}
+
+  docr_lnx_x86_64:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - amazonlinux-2023
+          - almalinux-8
+          - almalinux-9
+          - centos-7
+          - debian-11
+          - debian-12
+          - fedora-latest
+          - opensuse-leap-15
+          - oraclelinux-8
+          - oraclelinux-9
+          # - rockylinux-8 # Need to troubleshoot issue with container startup
+          - rockylinux-9
+          - ubuntu-1804
+          - ubuntu-2004
+          - ubuntu-2204
     runs-on: ubuntu-latest
     env:
       FORCE_FFI_YAJL: ext
       CHEF_LICENSE: accept-no-persist
+      KITCHEN_LOCAL_YAML: kitchen.dokken.yml
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.1"
-          bundler-cache: true
-          working-directory: kitchen-tests
-      - name: Run Test Kitchen
-        working-directory: kitchen-tests
-        run:  |
-          bundle exec kitchen test end-to-end-${{ matrix.os }}
+        uses: actions/checkout@v4
+      - name: Install Chef
+        uses: actionshub/chef-install@3.0.0
+      - name: Kitchen Test
+        run: kitchen test end-to-end-${{ matrix.os }}
+
   # Amazon Linux 2 has an issue with systemctl (throws a timedatectl error)
   # if dokken container hosted on Ubuntu 22.04 or later. Lock to Ubuntu 20.04
   # for now.
-  linux-2004-host:
+  docr_ubnt-2004_x86_64:
     strategy:
       fail-fast: false
       matrix:
         os:
-          - 'amazonlinux-2'
-        ruby: ['3.1']
+          - amazonlinux-2
+          - oraclelinux-7
     runs-on: ubuntu-20.04
     env:
       FORCE_FFI_YAJL: ext
       CHEF_LICENSE: accept-no-persist
+      KITCHEN_LOCAL_YAML: kitchen.dokken.yml
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.1"
-          bundler-cache: true
-          working-directory: kitchen-tests
-      - name: Run Test Kitchen
-        working-directory: kitchen-tests
-        run:  |
-          bundle exec kitchen test end-to-end-${{ matrix.os }}
+        uses: actions/checkout@v4
+      - name: Install Chef
+        uses: actionshub/chef-install@3.0.0
+      - name: Kitchen Test
+        run: kitchen test end-to-end-${{ matrix.os }}
+
+  vm_lnx_x86_64:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - amazonlinux-2
+          - amazonlinux-2023
+          - almalinux-8
+          - almalinux-9
+          # - centos-7 Need to troubleshoot slow and hanging behaviour on lifecycle hook run
+          - debian-11
+          - debian-12
+          - fedora-latest
+          # - freebsd-13 # Need to troubleshoot shell invalid issue
+          # - freebsd-14 # Need to troubleshoot bad bento box issue
+          - opensuse-leap-15
+          - oracle-7
+          - oracle-8
+          - oracle-9
+          - rockylinux-8
+          - rockylinux-9
+          - ubuntu-1804
+          - ubuntu-2004
+          - ubuntu-2204
+    runs-on: ubuntu-latest
+    env:
+      CHEF_LICENSE: accept-no-persist
+      KITCHEN_LOCAL_YAML: kitchen.linux.ci.yml
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Vagrant and VirtualBox
+        run: |
+          wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
+          wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor | sudo tee /usr/share/keyrings/oracle-virtualbox-2016.gpg
+          echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+          echo "deb [arch=amd64 signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list
+          sudo apt-get update
+          sudo apt-get install -y vagrant virtualbox
+      - name: Install Chef
+        uses: actionshub/chef-install@3.0.0
+      - name: Kitchen Test
+        run: kitchen test end-to-end-${{ matrix.os }}
diff --git a/.github/workflows/selfhosted-fips.yml b/.github/workflows/selfhosted-fips.yml
@@ -6,7 +6,7 @@ name: selfhosted-fips
   push:
     branches:
       - main
-jobs: 
+jobs:
   linux:
     strategy:
       fail-fast: false
@@ -40,7 +40,7 @@ jobs:
           fi
           set -e
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             clean: false
       - name: 'Install Chef/Ohai from Omnitruck'

diff --git a/.github/workflows/unit_specs.yml b/.github/workflows/unit_specs.yml
@@ -11,7 +11,7 @@ jobs:
   unit:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         clean: true
     - uses: ruby/setup-ruby@v1

diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,9 @@ Vagrantfile
 kitchen-tests/nodes/*
 kitchen-tests/Gemfile.lock
 kitchen-tests/Berksfile.lock
+kitchen-tests/Policyfile.lock.json
+kitchen-tests/.kitchen
+
 
 # Temporary files present during spec runs
 spec/data/test-dir