Merge remote-tracking branch 'github/pull/573'

[chef.git] / .github / workflows / test-kitchen.yml

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 5c622df16ba003f872fc58a35e74c9f6a71bcb9b..2469ab522bc67dadbf4cca6e9604e29e39610bab 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -5,13 +5,13 @@ on:
   - pull_request
 
 concurrency:
   - pull_request
 
 concurrency:

-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

   cancel-in-progress: true
 
 jobs:
   kitchen:
     name: Test Kitchen
   cancel-in-progress: true
 
 jobs:
   kitchen:
     name: Test Kitchen

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

     strategy:
       matrix:
         suite:
     strategy:
       matrix:
         suite:


@@ -39,6 +39,12 @@ jobs:
           - exim
           - fail2ban
           - forum
           - exim
           - fail2ban
           - forum

+          - foundation-board
+          - foundation-dwg
+          - foundation-mwg
+          - foundation-owg
+          - foundation-welcome
+          - foundation-wiki

           - ftp
           - geodns
           - geoipupdate
           - ftp
           - geodns
           - geoipupdate


@@ -91,6 +97,8 @@ jobs:
           - spamassassin
           - ssl
           - stateofthemap
           - spamassassin
           - ssl
           - stateofthemap

+          - stateofthemap-container
+          - stateofthemap-wordpress

           - subversion
           - supybot
           - switch2osm
           - subversion
           - supybot
           - switch2osm


@@ -107,7 +115,17 @@ jobs:
           - wordpress
           - wiki
         os:
           - wordpress
           - wiki
         os:

-          - ubuntu-2004
+          - ubuntu-2204
+        include:
+          - os: ubuntu-2004
+            suite: mailman
+          - os: ubuntu-2004
+            suite: osqa
+        exclude:
+          - suite: mailman
+            os: ubuntu-2204
+          - suite: osqa
+            os: ubuntu-2204

       fail-fast: false
     steps:
     - name: Check out code
       fail-fast: false
     steps:
     - name: Check out code


@@ -115,6 +133,10 @@ jobs:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:

+        ruby-version: 3.1

         bundler-cache: true
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
         bundler-cache: true
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}

+    - name: Gather journal output
+      run: bundle exec kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c journalctl --since=yesterday
+      if: ${{ failure() }}