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 577297c7b2eaa94bbb93a077f16b8247c6369abd..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:


@@ -24,6 +24,7 @@ jobs:
           - blogs
           - civicrm
           - clamav
           - blogs
           - civicrm
           - clamav

+          - community

           - db-backup
           - db-base
           - db-master
           - db-backup
           - db-base
           - db-master


@@ -38,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


@@ -55,6 +62,7 @@ jobs:
           - logstash-forwarder
           - mail
           - mailman
           - logstash-forwarder
           - mail
           - mailman

+          - matomo

           - memcached
           - munin
           - munin-plugins
           - memcached
           - munin
           - munin-plugins


@@ -69,11 +77,11 @@ jobs:
           - osmosis
           - osqa
           - otrs
           - osmosis
           - osqa
           - otrs

+          - overpass

           - passenger
           - php
           - php-apache
           - php-fpm
           - passenger
           - php
           - php-apache
           - php-fpm

-          - piwik

           - planet
           - planet-current
           - planet-dump
           - planet
           - planet-current
           - planet-dump


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

+          - stateofthemap-container
+          - stateofthemap-wordpress

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


@@ -99,14 +109,23 @@ jobs:
           - tilelog
           - tools
           - trac
           - tilelog
           - tools
           - trac

-          - web-backend

           - web-cgimap
           - web-frontend
           - web-rails
           - wordpress
           - wiki
         os:
           - web-cgimap
           - web-frontend
           - web-rails
           - 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


@@ -114,10 +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
         bundler-cache: true

-    - name: Disable apparmor for mysqld
-      run: |
-        sudo apt-get install apparmor-utils
-        sudo aa-disable /usr/sbin/mysqld

     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
     - 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() }}