chore: test apache2 with cinc

Author: damacus

.github/workflows/ci.yml

@@ -23,6 +23,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        product:
+          - chef
+          - cinc
         os:
           - almalinux-8
           - almalinux-9
@@ -66,6 +69,11 @@ jobs:
           # mod_wsgi idempotency issue on openSUSE Leap 15 - package reinstalls on second run
           - os: opensuse-leap-15
             suite: mod-wsgi
+        include:
+          - product: chef
+            chef_version: current
+          - product: cinc
+            chef_version: latest
 
     steps:
       - name: Check out code
@@ -76,19 +84,25 @@ jobs:
         uses: actionshub/test-kitchen@main
         env:
           CHEF_LICENSE: accept-no-persist
+          CHEF_VERSION: ${{ matrix.chef_version }}
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
+          KITCHEN_PRODUCT_NAME: ${{ matrix.product }}
         with:
           suite: ${{ matrix.suite }}
           os: ${{ matrix.os }}
       - name: Print debug output on failure
         if: failure()
+        env:
+          CHEF_VERSION: ${{ matrix.chef_version }}
+          KITCHEN_LOCAL_YAML: kitchen.dokken.yml
+          KITCHEN_PRODUCT_NAME: ${{ matrix.product }}
         run: |
           set -x
           sudo journalctl -l --since today
-          KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
+          /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
 
   final:
     runs-on: ubuntu-latest
     needs: [integration]
     steps:
-      - run: echo ${{needs.integration.outputs}}
+      - run: echo '${{ toJSON(needs.integration.outputs) }}'

.github/workflows/copilot-setup-steps.yml

@@ -18,7 +18,20 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v5
-      - name: Install Chef
-        uses: actionshub/chef-install@main
+      - name: Prepare Gemfile
+        run: |
+          if [ ! -f Gemfile ]; then
+            {
+              echo "source 'https://rubygems.org'"
+              echo "gem 'berkshelf'"
+            } > Gemfile
+          fi
+        shell: bash
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
       - name: Install cookbooks
-        run: berks install
+        run: bundle exec berks install
+        shell: bash

.github/workflows/release.yml

@@ -16,7 +16,7 @@ permissions:
 
 jobs:
   release:
-    uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@6.0.0
+    uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@6.0.1
     secrets:
       token: ${{ secrets.PORTER_GITHUB_TOKEN }}
       supermarket_user: ${{ secrets.CHEF_SUPERMARKET_USER }}

kitchen.dokken.yml

@@ -1,10 +1,14 @@
 driver:
   name: dokken
   privileged: true
-  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
+  chef_image: "<%= ENV['KITCHEN_PRODUCT_NAME'] == 'cinc' ? 'cincproject/cinc' : 'chef/chef' %>"
+  chef_version: "<%= ENV['CHEF_VERSION'] || (ENV['KITCHEN_PRODUCT_NAME'] == 'cinc' ? 'latest' : 'current') %>"
 
 transport: { name: dokken }
-provisioner: { name: dokken }
+provisioner:
+  name: dokken
+  chef_binary: "<%= ENV['KITCHEN_PRODUCT_NAME'] == 'cinc' ? '/opt/cinc/bin/cinc-client' : '/opt/chef/bin/chef-client' %>"
+  product_name: "<%= ENV['KITCHEN_PRODUCT_NAME'] || 'chef' %>"
 
 platforms:
   - name: almalinux-8